diff --git a/app/component/StopInfo.js b/app/component/itinerary/StopInfo.js
similarity index 91%
rename from app/component/StopInfo.js
rename to app/component/itinerary/StopInfo.js
index 26c9883d3a..4f77b99e5a 100644
--- a/app/component/StopInfo.js
+++ b/app/component/itinerary/StopInfo.js
@@ -2,10 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { FormattedMessage } from 'react-intl';
-import { configShape } from '../util/shapes';
-import { durationToString } from '../util/timeUtils';
-import { isKeyboardSelectionEvent } from '../util/browser';
-import Icon from './Icon';
+import { configShape } from '../../util/shapes';
+import { durationToString } from '../../util/timeUtils';
+import { isKeyboardSelectionEvent } from '../../util/browser';
+import Icon from '../Icon';
 
 export default function StopInfo(
   { intermediateStopCount, toggleFunction, duration, showIntermediateStops },
diff --git a/app/component/itinerary/TransitLeg.js b/app/component/itinerary/TransitLeg.js
index 3a83cd6134..5577382ed3 100644
--- a/app/component/itinerary/TransitLeg.js
+++ b/app/component/itinerary/TransitLeg.js
@@ -41,7 +41,7 @@ import { shouldShowFareInfo } from '../../util/fareUtils';
 import { AlertEntityType, AlertSeverityLevelType } from '../../constants';
 import { legShape, configShape } from '../../util/shapes';
 import ZoneIcon from '../ZoneIcon';
-import StopInfo from '../StopInfo';
+import StopInfo from './StopInfo';
 import InterlineInfo from './InterlineInfo';
 import AlternativeLegsInfo from './AlternativeLegsInfo';
 import LegInfo from './LegInfo';
diff --git a/app/component/DateSelect.js b/app/component/stop/DateSelect.js
similarity index 99%
rename from app/component/DateSelect.js
rename to app/component/stop/DateSelect.js
index 5da48dbaea..94ca002d4c 100644
--- a/app/component/DateSelect.js
+++ b/app/component/stop/DateSelect.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import { intlShape } from 'react-intl';
 
 import Select from 'react-select';
-import Icon from './Icon';
+import Icon from '../Icon';
 
 function DateSelect(props, context) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
diff --git a/app/component/FilterTimeTableModal.js b/app/component/stop/FilterTimeTableModal.js
similarity index 96%
rename from app/component/FilterTimeTableModal.js
rename to app/component/stop/FilterTimeTableModal.js
index 97f29a919f..6fcd147ec4 100644
--- a/app/component/FilterTimeTableModal.js
+++ b/app/component/stop/FilterTimeTableModal.js
@@ -4,12 +4,12 @@ import intersection from 'lodash/intersection';
 import { FormattedMessage, intlShape } from 'react-intl';
 import cx from 'classnames';
 import Modal from '@hsl-fi/modal';
-import Icon from './Icon';
-import routeCompare from '../util/route-compare';
-import withBreakpoint from '../util/withBreakpoint';
-import { isKeyboardSelectionEvent } from '../util/browser';
-import { getRouteMode } from '../util/modeUtils';
-import { stopShape } from '../util/shapes';
+import Icon from '../Icon';
+import routeCompare from '../../util/route-compare';
+import withBreakpoint from '../../util/withBreakpoint';
+import { isKeyboardSelectionEvent } from '../../util/browser';
+import { getRouteMode } from '../../util/modeUtils';
+import { stopShape } from '../../util/shapes';
 
 class FilterTimeTableModal extends React.Component {
   static propTypes = {
diff --git a/app/component/StopAlerts.js b/app/component/stop/StopAlerts.js
similarity index 91%
rename from app/component/StopAlerts.js
rename to app/component/stop/StopAlerts.js
index 15c423801d..d91a8b0c3d 100644
--- a/app/component/StopAlerts.js
+++ b/app/component/stop/StopAlerts.js
@@ -1,16 +1,16 @@
 import React from 'react';
 import { intlShape } from 'react-intl';
 import { uniq } from 'lodash';
-import AlertList from './AlertList';
+import AlertList from '../AlertList';
 import {
   getCancelationsForStop,
   getAlertsForObject,
   getServiceAlertsForStation,
-} from '../util/alertUtils';
-import { getRouteMode } from '../util/modeUtils';
-import { epochToTime } from '../util/timeUtils';
-import { stopShape, configShape } from '../util/shapes';
-import { AlertSeverityLevelType, AlertEntityType } from '../constants';
+} from '../../util/alertUtils';
+import { getRouteMode } from '../../util/modeUtils';
+import { epochToTime } from '../../util/timeUtils';
+import { stopShape, configShape } from '../../util/shapes';
+import { AlertSeverityLevelType, AlertEntityType } from '../../constants';
 
 export const isRelevantEntity = (entity, stopIds, routeIds) =>
   // eslint-disable-next-line no-underscore-dangle
diff --git a/app/component/StopAlertsContainer.js b/app/component/stop/StopAlertsContainer.js
similarity index 97%
rename from app/component/StopAlertsContainer.js
rename to app/component/stop/StopAlertsContainer.js
index 7e2e466c4d..da446cc1f1 100644
--- a/app/component/StopAlertsContainer.js
+++ b/app/component/stop/StopAlertsContainer.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { stopShape } from '../util/shapes';
+import { stopShape } from '../../util/shapes';
 import StopAlerts from './StopAlerts';
 
 const StopAlertsContainer = ({ stop }) => {
diff --git a/app/component/StopCardHeader.js b/app/component/stop/StopCardHeader.js
similarity index 91%
rename from app/component/StopCardHeader.js
rename to app/component/stop/StopCardHeader.js
index 097b715cbd..dd12e0ddeb 100644
--- a/app/component/StopCardHeader.js
+++ b/app/component/stop/StopCardHeader.js
@@ -2,15 +2,15 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { intlShape } from 'react-intl';
 import { matchShape } from 'found';
-import { stopShape, stationShape } from '../util/shapes';
-import CardHeader from './CardHeader';
-import { getJson } from '../util/xhrPromise';
-import { saveSearch } from '../action/SearchActions';
-import { isIOS } from '../util/browser';
-import LazilyLoad, { importLazy } from './LazilyLoad';
+import { stopShape, stationShape } from '../../util/shapes';
+import CardHeader from '../CardHeader';
+import { getJson } from '../../util/xhrPromise';
+import { saveSearch } from '../../action/SearchActions';
+import { isIOS } from '../../util/browser';
+import LazilyLoad, { importLazy } from '../LazilyLoad';
 
 const modules = {
-  FavouriteStopContainer: () => importLazy(import('./FavouriteStopContainer')),
+  FavouriteStopContainer: () => importLazy(import('../FavouriteStopContainer')),
 };
 
 class StopCardHeader extends React.Component {
diff --git a/app/component/StopCardHeaderContainer.js b/app/component/stop/StopCardHeaderContainer.js
similarity index 100%
rename from app/component/StopCardHeaderContainer.js
rename to app/component/stop/StopCardHeaderContainer.js
diff --git a/app/component/StopPageContentContainer.js b/app/component/stop/StopPageContentContainer.js
similarity index 92%
rename from app/component/StopPageContentContainer.js
rename to app/component/stop/StopPageContentContainer.js
index 0b7049b800..8d6991714c 100644
--- a/app/component/StopPageContentContainer.js
+++ b/app/component/stop/StopPageContentContainer.js
@@ -4,13 +4,18 @@ import { createRefetchContainer, graphql } from 'react-relay';
 import connectToStores from 'fluxible-addons-react/connectToStores';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { matchShape, routerShape, RedirectException } from 'found';
-import { configShape, errorShape, relayShape, stopShape } from '../util/shapes';
-import DepartureListContainer from './DepartureListContainer';
-import Loading from './Loading';
-import Icon from './Icon';
-import ScrollableWrapper from './ScrollableWrapper';
-import { isBrowser } from '../util/browser';
-import { PREFIX_STOPS } from '../util/path';
+import {
+  configShape,
+  errorShape,
+  relayShape,
+  stopShape,
+} from '../../util/shapes';
+import DepartureListContainer from '../DepartureListContainer';
+import Loading from '../Loading';
+import Icon from '../Icon';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_STOPS } from '../../util/path';
 
 class StopPageContent extends React.Component {
   static propTypes = {
diff --git a/app/component/StopPageHeader.js b/app/component/stop/StopPageHeader.js
similarity index 92%
rename from app/component/StopPageHeader.js
rename to app/component/stop/StopPageHeader.js
index 68ee8c2cff..b4440395da 100644
--- a/app/component/StopPageHeader.js
+++ b/app/component/stop/StopPageHeader.js
@@ -4,7 +4,7 @@ import getContext from 'recompose/getContext';
 import compose from 'recompose/compose';
 
 import StopCardHeaderContainer from './StopCardHeaderContainer';
-import withBreakpoint from '../util/withBreakpoint';
+import withBreakpoint from '../../util/withBreakpoint';
 
 const StopPageHeader = compose(
   withBreakpoint,
diff --git a/app/component/StopPageHeaderContainer.js b/app/component/stop/StopPageHeaderContainer.js
similarity index 100%
rename from app/component/StopPageHeaderContainer.js
rename to app/component/stop/StopPageHeaderContainer.js
diff --git a/app/component/StopPageMapContainer.js b/app/component/stop/StopPageMapContainer.js
similarity index 90%
rename from app/component/StopPageMapContainer.js
rename to app/component/stop/StopPageMapContainer.js
index a10931d8c2..ce26e3106a 100644
--- a/app/component/StopPageMapContainer.js
+++ b/app/component/stop/StopPageMapContainer.js
@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { configShape } from '../util/shapes';
-import StopPageMap from './map/StopPageMap';
+import { configShape } from '../../util/shapes';
+import StopPageMap from '../map/StopPageMap';
 
 function StopPageMapContainer({ stop }) {
   if (!stop) {
diff --git a/app/component/StopPageMeta.js b/app/component/stop/StopPageMeta.js
similarity index 90%
rename from app/component/StopPageMeta.js
rename to app/component/stop/StopPageMeta.js
index ce0bd1ceef..9ca73894bf 100644
--- a/app/component/StopPageMeta.js
+++ b/app/component/stop/StopPageMeta.js
@@ -4,9 +4,9 @@ import { createFragmentContainer, graphql } from 'react-relay';
 import compose from 'recompose/compose';
 import getContext from 'recompose/getContext';
 import mapProps from 'recompose/mapProps';
-import { configShape } from '../util/shapes';
+import { configShape } from '../../util/shapes';
 
-import { generateMetaData } from '../util/metaUtils';
+import { generateMetaData } from '../../util/metaUtils';
 
 const StopPageMeta = compose(
   getContext({ config: configShape, intl: intlShape }),
diff --git a/app/component/StopPageTabContainer.js b/app/component/stop/StopPageTabContainer.js
similarity index 97%
rename from app/component/StopPageTabContainer.js
rename to app/component/stop/StopPageTabContainer.js
index c0fe5578e1..2d9351d971 100644
--- a/app/component/StopPageTabContainer.js
+++ b/app/component/stop/StopPageTabContainer.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { alertShape } from '../util/shapes';
+import { alertShape } from '../../util/shapes';
 import StopPageTabs from './StopPageTabs';
 
 function StopPageTabContainer({ children, stop }) {
diff --git a/app/component/StopPageTabs.js b/app/component/stop/StopPageTabs.js
similarity index 94%
rename from app/component/StopPageTabs.js
rename to app/component/stop/StopPageTabs.js
index b565690d89..bac03d96c2 100644
--- a/app/component/StopPageTabs.js
+++ b/app/component/stop/StopPageTabs.js
@@ -2,25 +2,25 @@ import cx from 'classnames';
 import React, { useState, useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { matchShape } from 'found';
-import { stopShape } from '../util/shapes';
-import { AlertSeverityLevelType } from '../constants';
+import { stopShape } from '../../util/shapes';
+import { AlertSeverityLevelType } from '../../constants';
 import {
   getCancelationsForStop,
   getAlertsForObject,
   getServiceAlertsForStation,
   getActiveAlertSeverityLevel,
-} from '../util/alertUtils';
-import withBreakpoint from '../util/withBreakpoint';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
-import { unixTime } from '../util/timeUtils';
+} from '../../util/alertUtils';
+import withBreakpoint from '../../util/withBreakpoint';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
+import { unixTime } from '../../util/timeUtils';
 import {
   PREFIX_DISRUPTION,
   PREFIX_ROUTES,
   PREFIX_STOPS,
   PREFIX_TERMINALS,
   PREFIX_TIMETABLE,
-} from '../util/path';
-import Icon from './Icon';
+} from '../../util/path';
+import Icon from '../Icon';
 
 const Tab = {
   Disruptions: PREFIX_DISRUPTION,
diff --git a/app/component/StopTimetablePage.js b/app/component/stop/StopTimetablePage.js
similarity index 89%
rename from app/component/StopTimetablePage.js
rename to app/component/stop/StopTimetablePage.js
index 75fb1983dd..3606dc6d29 100644
--- a/app/component/StopTimetablePage.js
+++ b/app/component/stop/StopTimetablePage.js
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { createRefetchContainer, graphql } from 'react-relay';
 import { matchShape, routerShape } from 'found';
-import { unixTime, unixToYYYYMMDD } from '../util/timeUtils';
-import { configShape, relayShape } from '../util/shapes';
-import { prepareServiceDay } from '../util/dateParamUtils';
+import { unixTime, unixToYYYYMMDD } from '../../util/timeUtils';
+import { configShape, relayShape } from '../../util/shapes';
+import { prepareServiceDay } from '../../util/dateParamUtils';
 import TimetableContainer from './TimetableContainer';
 
 class StopTimetablePage extends React.Component {
diff --git a/app/component/StopTitle.js b/app/component/stop/StopTitle.js
similarity index 100%
rename from app/component/StopTitle.js
rename to app/component/stop/StopTitle.js
diff --git a/app/component/TerminalAlertsContainer.js b/app/component/stop/TerminalAlertsContainer.js
similarity index 97%
rename from app/component/TerminalAlertsContainer.js
rename to app/component/stop/TerminalAlertsContainer.js
index 781ea51594..70b8679ff8 100644
--- a/app/component/TerminalAlertsContainer.js
+++ b/app/component/stop/TerminalAlertsContainer.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { stationShape } from '../util/shapes';
+import { stationShape } from '../../util/shapes';
 import StopAlerts from './StopAlerts';
 
 const TerminalAlertsContainer = ({ station }) => {
diff --git a/app/component/TerminalPageContentContainer.js b/app/component/stop/TerminalPageContentContainer.js
similarity index 93%
rename from app/component/TerminalPageContentContainer.js
rename to app/component/stop/TerminalPageContentContainer.js
index 4d27c623e7..114fd55668 100644
--- a/app/component/TerminalPageContentContainer.js
+++ b/app/component/stop/TerminalPageContentContainer.js
@@ -4,13 +4,13 @@ import { createRefetchContainer, graphql } from 'react-relay';
 import connectToStores from 'fluxible-addons-react/connectToStores';
 import { FormattedMessage } from 'react-intl';
 import { routerShape, RedirectException } from 'found';
-import DepartureListContainer from './DepartureListContainer';
-import Loading from './Loading';
-import Icon from './Icon';
-import ScrollableWrapper from './ScrollableWrapper';
-import { isBrowser } from '../util/browser';
-import { PREFIX_TERMINALS } from '../util/path';
-import { stationShape, errorShape, relayShape } from '../util/shapes';
+import DepartureListContainer from '../DepartureListContainer';
+import Loading from '../Loading';
+import Icon from '../Icon';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_TERMINALS } from '../../util/path';
+import { stationShape, errorShape, relayShape } from '../../util/shapes';
 
 class TerminalPageContent extends React.Component {
   static propTypes = {
diff --git a/app/component/TerminalPageHeaderContainer.js b/app/component/stop/TerminalPageHeaderContainer.js
similarity index 100%
rename from app/component/TerminalPageHeaderContainer.js
rename to app/component/stop/TerminalPageHeaderContainer.js
diff --git a/app/component/TerminalPageMapContainer.js b/app/component/stop/TerminalPageMapContainer.js
similarity index 91%
rename from app/component/TerminalPageMapContainer.js
rename to app/component/stop/TerminalPageMapContainer.js
index efcfd85f34..79b89dd628 100644
--- a/app/component/TerminalPageMapContainer.js
+++ b/app/component/stop/TerminalPageMapContainer.js
@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { configShape } from '../util/shapes';
-import StopPageMap from './map/StopPageMap';
+import { configShape } from '../../util/shapes';
+import StopPageMap from '../map/StopPageMap';
 
 const TerminalPageMapContainer = ({ station }) => {
   if (!station) {
diff --git a/app/component/TerminalPageMeta.js b/app/component/stop/TerminalPageMeta.js
similarity index 91%
rename from app/component/TerminalPageMeta.js
rename to app/component/stop/TerminalPageMeta.js
index c0a55d9b81..9d7e94aa39 100644
--- a/app/component/TerminalPageMeta.js
+++ b/app/component/stop/TerminalPageMeta.js
@@ -4,9 +4,9 @@ import { createFragmentContainer, graphql } from 'react-relay';
 import compose from 'recompose/compose';
 import getContext from 'recompose/getContext';
 import mapProps from 'recompose/mapProps';
-import { configShape } from '../util/shapes';
+import { configShape } from '../../util/shapes';
 
-import { generateMetaData } from '../util/metaUtils';
+import { generateMetaData } from '../../util/metaUtils';
 
 const TerminalPageMeta = compose(
   getContext({ config: configShape, intl: intlShape }),
diff --git a/app/component/TerminalPageTabContainer.js b/app/component/stop/TerminalPageTabContainer.js
similarity index 97%
rename from app/component/TerminalPageTabContainer.js
rename to app/component/stop/TerminalPageTabContainer.js
index 3582915098..ceb68b6224 100644
--- a/app/component/TerminalPageTabContainer.js
+++ b/app/component/stop/TerminalPageTabContainer.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { alertShape } from '../util/shapes';
+import { alertShape } from '../../util/shapes';
 import StopPageTabs from './StopPageTabs';
 
 function TerminalPageTabContainer({ children, station }) {
diff --git a/app/component/TerminalTimetablePage.js b/app/component/stop/TerminalTimetablePage.js
similarity index 90%
rename from app/component/TerminalTimetablePage.js
rename to app/component/stop/TerminalTimetablePage.js
index 249ce062d7..4f95d98d17 100644
--- a/app/component/TerminalTimetablePage.js
+++ b/app/component/stop/TerminalTimetablePage.js
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { createRefetchContainer, graphql } from 'react-relay';
 import { matchShape, routerShape } from 'found';
-import { configShape, relayShape } from '../util/shapes';
-import { unixTime, unixToYYYYMMDD } from '../util/timeUtils';
-import { prepareServiceDay } from '../util/dateParamUtils';
+import { configShape, relayShape } from '../../util/shapes';
+import { unixTime, unixToYYYYMMDD } from '../../util/timeUtils';
+import { prepareServiceDay } from '../../util/dateParamUtils';
 import TimetableContainer from './TimetableContainer';
 
 class TerminalTimetablePage extends React.Component {
diff --git a/app/component/TerminalTitle.js b/app/component/stop/TerminalTitle.js
similarity index 100%
rename from app/component/TerminalTitle.js
rename to app/component/stop/TerminalTitle.js
diff --git a/app/component/TimeTableOptionsPanel.js b/app/component/stop/TimeTableOptionsPanel.js
similarity index 94%
rename from app/component/TimeTableOptionsPanel.js
rename to app/component/stop/TimeTableOptionsPanel.js
index 16f6a0e088..4d1d4082f8 100644
--- a/app/component/TimeTableOptionsPanel.js
+++ b/app/component/stop/TimeTableOptionsPanel.js
@@ -2,10 +2,10 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import uniqBy from 'lodash/uniqBy';
-import Icon from './Icon';
-import { ExtendedRouteTypes } from '../constants';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
-import { stopShape } from '../util/shapes';
+import Icon from '../Icon';
+import { ExtendedRouteTypes } from '../../constants';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
+import { stopShape } from '../../util/shapes';
 
 const MAX_ROUTEFILTER_LEN = 13;
 
diff --git a/app/component/Timetable.js b/app/component/stop/Timetable.js
similarity index 97%
rename from app/component/Timetable.js
rename to app/component/stop/Timetable.js
index 22c212ae06..107a53c76c 100644
--- a/app/component/Timetable.js
+++ b/app/component/stop/Timetable.js
@@ -8,19 +8,19 @@ import padStart from 'lodash/padStart';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { matchShape, routerShape, RedirectException } from 'found';
 import cx from 'classnames';
-import { configShape } from '../util/shapes';
-import Icon from './Icon';
+import { configShape } from '../../util/shapes';
+import Icon from '../Icon';
 import FilterTimeTableModal from './FilterTimeTableModal';
 import TimeTableOptionsPanel from './TimeTableOptionsPanel';
 import TimetableRow from './TimetableRow';
-import { RealtimeStateType } from '../constants';
-import SecondaryButton from './SecondaryButton';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
+import { RealtimeStateType } from '../../constants';
+import SecondaryButton from '../SecondaryButton';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
 import DateSelect from './DateSelect';
-import ScrollableWrapper from './ScrollableWrapper';
-import { replaceQueryParams } from '../util/queryUtils';
-import { isBrowser } from '../util/browser';
-import { PREFIX_STOPS } from '../util/path';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { replaceQueryParams } from '../../util/queryUtils';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_STOPS } from '../../util/path';
 
 const mapStopTimes = stoptimesObject =>
   stoptimesObject
diff --git a/app/component/TimetableContainer.js b/app/component/stop/TimetableContainer.js
similarity index 100%
rename from app/component/TimetableContainer.js
rename to app/component/stop/TimetableContainer.js
diff --git a/app/component/TimetableRow.js b/app/component/stop/TimetableRow.js
similarity index 100%
rename from app/component/TimetableRow.js
rename to app/component/stop/TimetableRow.js
diff --git a/app/component/stop-cards.scss b/app/component/stop/stop-cards.scss
similarity index 100%
rename from app/component/stop-cards.scss
rename to app/component/stop/stop-cards.scss
diff --git a/app/component/stop.scss b/app/component/stop/stop.scss
similarity index 100%
rename from app/component/stop.scss
rename to app/component/stop/stop.scss
diff --git a/app/stopRoutes.js b/app/stopRoutes.js
index 59fa19ad05..ca4482673a 100644
--- a/app/stopRoutes.js
+++ b/app/stopRoutes.js
@@ -151,10 +151,10 @@ export default function getStopRoutes(isTerminal = false) {
               getComponent={() => {
                 return isTerminal
                   ? import(
-                      /* webpackChunkName: "stop" */ './component/TerminalTitle'
+                      /* webpackChunkName: "stop" */ './component/stop/TerminalTitle'
                     ).then(getDefault)
                   : import(
-                      /* webpackChunkName: "stop" */ './component/StopTitle'
+                      /* webpackChunkName: "stop" */ './component/stop/StopTitle'
                     ).then(getDefault);
               }}
               render={getComponentOrNullRenderer}
@@ -166,10 +166,10 @@ export default function getStopRoutes(isTerminal = false) {
               getComponent={() => {
                 return isTerminal
                   ? import(
-                      /* webpackChunkName: "stop" */ './component/TerminalPageHeaderContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/TerminalPageHeaderContainer'
                     ).then(getDefault)
                   : import(
-                      /* webpackChunkName: "stop" */ './component/StopPageHeaderContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/StopPageHeaderContainer'
                     ).then(getDefault);
               }}
               query={queryMap.pageHeader}
@@ -181,10 +181,10 @@ export default function getStopRoutes(isTerminal = false) {
               getComponent={() => {
                 return isTerminal
                   ? import(
-                      /* webpackChunkName: "stop" */ './component/TerminalPageTabContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/TerminalPageTabContainer'
                     ).then(getDefault)
                   : import(
-                      /* webpackChunkName: "stop" */ './component/StopPageTabContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/StopPageTabContainer'
                     ).then(getDefault);
               }}
               query={queryMap.pageTab}
@@ -194,12 +194,12 @@ export default function getStopRoutes(isTerminal = false) {
                 getComponent={() => {
                   return isTerminal
                     ? import(
-                        /* webpackChunkName: "stop" */ './component/TerminalPageContentContainer'
+                        /* webpackChunkName: "stop" */ './component/stop/TerminalPageContentContainer'
                       )
                         .then(getDefault)
                         .catch(errorLoading)
                     : import(
-                        /* webpackChunkName: "stop" */ './component/StopPageContentContainer'
+                        /* webpackChunkName: "stop" */ './component/stop/StopPageContentContainer'
                       )
                         .then(getDefault)
                         .catch(errorLoading);
@@ -217,12 +217,12 @@ export default function getStopRoutes(isTerminal = false) {
                 getComponent={() => {
                   return isTerminal
                     ? import(
-                        /* webpackChunkName: "stop" */ './component/TerminalTimetablePage'
+                        /* webpackChunkName: "stop" */ './component/stop/TerminalTimetablePage'
                       )
                         .then(getDefault)
                         .catch(errorLoading)
                     : import(
-                        /* webpackChunkName: "stop" */ './component/StopTimetablePage'
+                        /* webpackChunkName: "stop" */ './component/stop/StopTimetablePage'
                       )
                         .then(getDefault)
                         .catch(errorLoading);
@@ -242,12 +242,12 @@ export default function getStopRoutes(isTerminal = false) {
                 getComponent={() => {
                   return isTerminal
                     ? import(
-                        /* webpackChunkName: "stop" */ './component/TerminalAlertsContainer'
+                        /* webpackChunkName: "stop" */ './component/stop/TerminalAlertsContainer'
                       )
                         .then(getDefault)
                         .catch(errorLoading)
                     : import(
-                        /* webpackChunkName: "stop" */ './component/StopAlertsContainer'
+                        /* webpackChunkName: "stop" */ './component/stop/StopAlertsContainer'
                       )
                         .then(getDefault)
                         .catch(errorLoading);
@@ -265,10 +265,10 @@ export default function getStopRoutes(isTerminal = false) {
                 // eslint-disable-next-line no-nested-ternary
                 return isTerminal
                   ? import(
-                      /* webpackChunkName: "stop" */ './component/TerminalPageMapContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/TerminalPageMapContainer'
                     ).then(getDefault)
                   : import(
-                      /* webpackChunkName: "stop" */ './component/StopPageMapContainer'
+                      /* webpackChunkName: "stop" */ './component/stop/StopPageMapContainer'
                     ).then(getDefault);
               }}
               query={queryMap.pageMap}
@@ -281,10 +281,10 @@ export default function getStopRoutes(isTerminal = false) {
               getComponent={() => {
                 return isTerminal
                   ? import(
-                      /* webpackChunkName: "stop" */ './component/TerminalPageMeta'
+                      /* webpackChunkName: "stop" */ './component/stop/TerminalPageMeta'
                     ).then(getDefault)
                   : import(
-                      /* webpackChunkName: "stop" */ './component/StopPageMeta'
+                      /* webpackChunkName: "stop" */ './component/stop/StopPageMeta'
                     ).then(getDefault);
               }}
               query={queryMap.pageMeta}
diff --git a/sass/_main.scss b/sass/_main.scss
index d105087366..64b7b0246f 100644
--- a/sass/_main.scss
+++ b/sass/_main.scss
@@ -16,7 +16,7 @@ $body-font-weight: $font-weight-medium;
 
 // Some of these files override sass variables Foundation uses,
 // so they must be loaded before the relevant foundation modules
-@import '../app/component/stop-cards';
+@import '../app/component/stop/stop-cards';
 @import '../app/component/alert-banner';
 @import '../app/component/map/map';
 @import '../app/component/map/popups/marker-popup';
@@ -30,7 +30,7 @@ $body-font-weight: $font-weight-medium;
 @import '../app/component/nearyou/stops-near-you';
 @import '../app/component/disruption';
 @import '../app/component/departure';
-@import '../app/component/stop';
+@import '../app/component/stop/stop';
 @import '../app/component/util';
 @import '../app/component/city-bike';
 @import '../app/component/favourite-icon-table';
diff --git a/test/unit/component/DateSelect.test.js b/test/unit/component/DateSelect.test.js
index 7f57b5567d..920eb4086d 100644
--- a/test/unit/component/DateSelect.test.js
+++ b/test/unit/component/DateSelect.test.js
@@ -6,7 +6,7 @@ import Select from 'react-select';
 
 import { mountWithIntl, shallowWithIntl } from '../helpers/mock-intl-enzyme';
 import configureMoment from '../../../app/util/configure-moment';
-import DateSelect from '../../../app/component/DateSelect';
+import DateSelect from '../../../app/component/stop/DateSelect';
 
 describe('<DateSelect />', () => {
   const defaultProps = {
diff --git a/test/unit/component/StopAlerts.test.js b/test/unit/component/StopAlerts.test.js
index 75a9e8d181..faa0568043 100644
--- a/test/unit/component/StopAlerts.test.js
+++ b/test/unit/component/StopAlerts.test.js
@@ -8,7 +8,7 @@ import {
   AlertEntityType,
 } from '../../../app/constants';
 import AlertList from '../../../app/component/AlertList';
-import StopAlerts from '../../../app/component/StopAlerts';
+import StopAlerts from '../../../app/component/stop/StopAlerts';
 
 describe('<StopAlerts />', () => {
   it("should indicate that there are no alerts if the stop's routes have no alerts and the stop has no canceled stoptimes", () => {
diff --git a/test/unit/component/StopCardHeader.test.js b/test/unit/component/StopCardHeader.test.js
index 3609a0ca25..55bb9638ef 100644
--- a/test/unit/component/StopCardHeader.test.js
+++ b/test/unit/component/StopCardHeader.test.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { shallowWithIntl } from '../helpers/mock-intl-enzyme';
 import ZoneIcon from '../../../app/component/ZoneIcon';
 
-import StopCardHeader from '../../../app/component/StopCardHeader';
+import StopCardHeader from '../../../app/component/stop/StopCardHeader';
 import ExternalLink from '../../../app/component/ExternalLink';
 import { mockContext, mockChildContextTypes } from '../helpers/mock-context';
 
diff --git a/test/unit/component/StopPageContentContainer.test.js b/test/unit/component/StopPageContentContainer.test.js
index f4ca105331..9c036e4948 100644
--- a/test/unit/component/StopPageContentContainer.test.js
+++ b/test/unit/component/StopPageContentContainer.test.js
@@ -4,7 +4,7 @@ import { describe, it } from 'mocha';
 
 import { mockMatch, mockRouter } from '../helpers/mock-router';
 import { shallowWithIntl } from '../helpers/mock-intl-enzyme';
-import { Component as StopPageContentContainer } from '../../../app/component/StopPageContentContainer';
+import { Component as StopPageContentContainer } from '../../../app/component/stop/StopPageContentContainer';
 
 describe('<StopPageContentContainer />', () => {
   it("should show a 'no departures' indicator", () => {
diff --git a/test/unit/component/StopPageTabs.test.js b/test/unit/component/StopPageTabs.test.js
index ea50956489..b067b79889 100644
--- a/test/unit/component/StopPageTabs.test.js
+++ b/test/unit/component/StopPageTabs.test.js
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import React from 'react';
 
 import { shallowWithIntl } from '../helpers/mock-intl-enzyme';
-import { Component as StopPageTabs } from '../../../app/component/StopPageTabs';
+import { Component as StopPageTabs } from '../../../app/component/stop/StopPageTabs';
 
 const context = {
   match: {
diff --git a/test/unit/component/Timetable.test.js b/test/unit/component/Timetable.test.js
index 45290d2128..4bf5bb9a35 100644
--- a/test/unit/component/Timetable.test.js
+++ b/test/unit/component/Timetable.test.js
@@ -3,8 +3,8 @@ import { describe, it } from 'mocha';
 import React from 'react';
 import { mockContext } from '../helpers/mock-context';
 
-import Timetable from '../../../app/component/Timetable';
-import TimetableRow from '../../../app/component/TimetableRow';
+import Timetable from '../../../app/component/stop/Timetable';
+import TimetableRow from '../../../app/component/stop/TimetableRow';
 import SecondaryButton from '../../../app/component/SecondaryButton';
 import { shallowWithIntl } from '../helpers/mock-intl-enzyme';
 import * as timetables from '../../../app/configurations/timetableConfigUtils';
diff --git a/test/unit/component/TimetableRow.test.js b/test/unit/component/TimetableRow.test.js
index c92bab5ce8..36287b9d33 100644
--- a/test/unit/component/TimetableRow.test.js
+++ b/test/unit/component/TimetableRow.test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
 import { shallowWithIntl } from '../helpers/mock-intl-enzyme';
-import TimetableRow from '../../../app/component/TimetableRow';
+import TimetableRow from '../../../app/component/stop/TimetableRow';
 
 import data from '../test-data/dt2720';