diff --git a/app/src/frontend/building-edit.tsx b/app/src/frontend/building-edit.tsx
index f062ff63..504219c2 100644
--- a/app/src/frontend/building-edit.tsx
+++ b/app/src/frontend/building-edit.tsx
@@ -2,11 +2,11 @@ import React, { Component, Fragment } from 'react';
 import { Link, NavLink, Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import ErrorBox from './error-box';
-import InfoBox from './info-box';
+import ErrorBox from './components/error-box';
+import InfoBox from './components/info-box';
 import Sidebar from './sidebar';
-import Tooltip from './tooltip';
-import { SaveIcon } from './icons';
+import Tooltip from './components/tooltip';
+import { SaveIcon } from './components/icons';
 
 import CONFIG from './fields-config.json';
 
diff --git a/app/src/frontend/building-view.tsx b/app/src/frontend/building-view.tsx
index 39e25a43..f58c18a9 100644
--- a/app/src/frontend/building-view.tsx
+++ b/app/src/frontend/building-view.tsx
@@ -3,9 +3,9 @@ import { Link, NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
-import Tooltip from './tooltip';
-import InfoBox from './info-box';
-import { EditIcon } from './icons';
+import Tooltip from './components/tooltip';
+import InfoBox from './components/info-box';
+import { EditIcon } from './components/icons';
 import { sanitiseURL } from './helpers';
 
 import CONFIG from './fields-config.json';
diff --git a/app/src/frontend/error-box.tsx b/app/src/frontend/components/error-box.tsx
similarity index 100%
rename from app/src/frontend/error-box.tsx
rename to app/src/frontend/components/error-box.tsx
diff --git a/app/src/frontend/icons.tsx b/app/src/frontend/components/icons.tsx
similarity index 100%
rename from app/src/frontend/icons.tsx
rename to app/src/frontend/components/icons.tsx
diff --git a/app/src/frontend/info-box.tsx b/app/src/frontend/components/info-box.tsx
similarity index 100%
rename from app/src/frontend/info-box.tsx
rename to app/src/frontend/components/info-box.tsx
diff --git a/app/src/frontend/logo.css b/app/src/frontend/components/logo.css
similarity index 100%
rename from app/src/frontend/logo.css
rename to app/src/frontend/components/logo.css
diff --git a/app/src/frontend/logo.tsx b/app/src/frontend/components/logo.tsx
similarity index 100%
rename from app/src/frontend/logo.tsx
rename to app/src/frontend/components/logo.tsx
diff --git a/app/src/frontend/supporter-logos.css b/app/src/frontend/components/supporter-logos.css
similarity index 100%
rename from app/src/frontend/supporter-logos.css
rename to app/src/frontend/components/supporter-logos.css
diff --git a/app/src/frontend/supporter-logos.tsx b/app/src/frontend/components/supporter-logos.tsx
similarity index 100%
rename from app/src/frontend/supporter-logos.tsx
rename to app/src/frontend/components/supporter-logos.tsx
diff --git a/app/src/frontend/tooltip.css b/app/src/frontend/components/tooltip.css
similarity index 100%
rename from app/src/frontend/tooltip.css
rename to app/src/frontend/components/tooltip.css
diff --git a/app/src/frontend/tooltip.tsx b/app/src/frontend/components/tooltip.tsx
similarity index 99%
rename from app/src/frontend/tooltip.tsx
rename to app/src/frontend/components/tooltip.tsx
index fef1a4c7..b9de9267 100644
--- a/app/src/frontend/tooltip.tsx
+++ b/app/src/frontend/components/tooltip.tsx
@@ -8,7 +8,7 @@ class Tooltip extends Component<any, any> { // TODO: add proper types
     static propTypes = { // TODO: generate propTypes from TS
         text: PropTypes.string
     };
-    
+
     constructor(props) {
         super(props);
         this.state = {
diff --git a/app/src/frontend/header.tsx b/app/src/frontend/header.tsx
index a19d9e4e..73ab5ccd 100644
--- a/app/src/frontend/header.tsx
+++ b/app/src/frontend/header.tsx
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import Logo from './logo';
+import Logo from './components/logo';
 import './header.css';
 
 /**
@@ -14,7 +14,7 @@ class Header extends React.Component<any, any> { // TODO: add proper types
             username: PropTypes.string
         })
     };
-    
+
     constructor(props) {
         super(props);
         this.state = {collapseMenu: true};
diff --git a/app/src/frontend/login.tsx b/app/src/frontend/login.tsx
index a80e088a..59730427 100644
--- a/app/src/frontend/login.tsx
+++ b/app/src/frontend/login.tsx
@@ -2,16 +2,16 @@ import React, { Component } from 'react';
 import { Redirect, Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import ErrorBox from './error-box';
-import InfoBox from './info-box';
-import SupporterLogos from './supporter-logos';
+import ErrorBox from './components/error-box';
+import InfoBox from './components/info-box';
+import SupporterLogos from './components/supporter-logos';
 
 class Login extends Component<any, any> { // TODO: add proper types
     static propTypes = { // TODO: generate propTypes from TS
         login: PropTypes.func,
         user: PropTypes.object
     };
-    
+
     constructor(props) {
         super(props);
         this.state = {
diff --git a/app/src/frontend/map.tsx b/app/src/frontend/map.tsx
index e32c52b2..5495568d 100644
--- a/app/src/frontend/map.tsx
+++ b/app/src/frontend/map.tsx
@@ -5,7 +5,7 @@ import { Map, TileLayer, ZoomControl, AttributionControl } from 'react-leaflet-u
 import '../../node_modules/leaflet/dist/leaflet.css'
 import './map.css'
 
-import { HelpIcon } from './icons';
+import { HelpIcon } from './components/icons';
 import Legend from './legend';
 import { parseCategoryURL } from '../parse';
 import SearchBox from './search-box';
@@ -25,7 +25,7 @@ class ColouringMap extends Component<any, any> { // TODO: add proper types
         match: PropTypes.object,
         history: PropTypes.object
     };
-    
+
     constructor(props) {
         super(props);
         this.state = {
diff --git a/app/src/frontend/multi-edit.tsx b/app/src/frontend/multi-edit.tsx
index 0a44c606..c0ef4356 100644
--- a/app/src/frontend/multi-edit.tsx
+++ b/app/src/frontend/multi-edit.tsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
 import CONFIG from './fields-config.json';
-import InfoBox from './info-box';
+import InfoBox from './components/info-box';
 import { sanitiseURL } from './helpers';
 
 const MultiEdit = (props) => {
diff --git a/app/src/frontend/overview.tsx b/app/src/frontend/overview.tsx
index 095974d8..64f12ece 100644
--- a/app/src/frontend/overview.tsx
+++ b/app/src/frontend/overview.tsx
@@ -3,7 +3,7 @@ import { NavLink, Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
-import { EditIcon } from './icons';
+import { EditIcon } from './components/icons';
 import CONFIG from './fields-config.json';
 
 const Overview = (props) => {
diff --git a/app/src/frontend/pages/about.tsx b/app/src/frontend/pages/about.tsx
index e8098bc6..5a4baa9b 100644
--- a/app/src/frontend/pages/about.tsx
+++ b/app/src/frontend/pages/about.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import SupporterLogos from '../supporter-logos';
+import SupporterLogos from '../components/supporter-logos';
 import './about.css';
 
 const AboutPage = () => (
diff --git a/app/src/frontend/pages/contributor-agreement.tsx b/app/src/frontend/pages/contributor-agreement.tsx
index 28878cf5..1a6e41a4 100644
--- a/app/src/frontend/pages/contributor-agreement.tsx
+++ b/app/src/frontend/pages/contributor-agreement.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-import InfoBox from '../info-box';
+import InfoBox from '../components/info-box';
 
 const ContributorAgreementPage : React.SFC<any> = () => (
     <article>
diff --git a/app/src/frontend/pages/my-account.tsx b/app/src/frontend/pages/my-account.tsx
index 6bbb11e2..eca2f88b 100644
--- a/app/src/frontend/pages/my-account.tsx
+++ b/app/src/frontend/pages/my-account.tsx
@@ -3,7 +3,7 @@ import { Link, Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import ConfirmationModal from '../confirmation-modal';
-import ErrorBox from '../error-box';
+import ErrorBox from '../components/error-box';
 
 class MyAccountPage extends Component<any, any> { // TODO: add proper types
     static propTypes = { // TODO: generate propTypes from TS
diff --git a/app/src/frontend/pages/privacy-policy.tsx b/app/src/frontend/pages/privacy-policy.tsx
index 291918f9..dac9b4ac 100644
--- a/app/src/frontend/pages/privacy-policy.tsx
+++ b/app/src/frontend/pages/privacy-policy.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-import InfoBox from '../info-box';
+import InfoBox from '../components/info-box';
 
 const PrivacyPolicyPage: React.SFC<any> = () => (
     <article>
diff --git a/app/src/frontend/search-box.tsx b/app/src/frontend/search-box.tsx
index cbc270b1..7198a0b9 100644
--- a/app/src/frontend/search-box.tsx
+++ b/app/src/frontend/search-box.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import './search-box.css';
-import { SearchIcon } from './icons';
+import { SearchIcon } from './components/icons';
 /**
  * Search for location
  */
@@ -11,7 +11,7 @@ class SearchBox extends Component<any, any> { // TODO: add proper types
         onLocate: PropTypes.func,
         isBuilding: PropTypes.bool
     };
-    
+
     constructor(props) {
         super(props);
         this.state = {
diff --git a/app/src/frontend/sidebar.tsx b/app/src/frontend/sidebar.tsx
index 5a16cc65..81e0f891 100644
--- a/app/src/frontend/sidebar.tsx
+++ b/app/src/frontend/sidebar.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import './sidebar.css';
-import { BackIcon } from './icons';
+import { BackIcon } from './components/icons';
 
 const Sidebar = (props) => (
     <div id="legend" className="info-container">
diff --git a/app/src/frontend/signup.tsx b/app/src/frontend/signup.tsx
index 1163d933..a3eb592d 100644
--- a/app/src/frontend/signup.tsx
+++ b/app/src/frontend/signup.tsx
@@ -2,9 +2,9 @@ import React, { Component } from 'react';
 import { Redirect, Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import ErrorBox from './error-box';
-import InfoBox from './info-box';
-import SupporterLogos from './supporter-logos';
+import ErrorBox from './components/error-box';
+import InfoBox from './components/info-box';
+import SupporterLogos from './components/supporter-logos';
 
 class SignUp extends Component<any, any> { // TODO: add proper types
     static propTypes = { // TODO: generate propTypes from TS
diff --git a/app/src/frontend/welcome.css b/app/src/frontend/welcome.css
deleted file mode 100644
index 8eed7ce6..00000000
--- a/app/src/frontend/welcome.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Welcome jumbotron
- */
-.welcome-float {
-    position: absolute;
-    z-index: 10000;
-    top: 0;
-    width: 100%;
-    border-radius: 0;
-    padding: 1.5em 2.5em 2.5em;
-}
-.welcome-float.jumbotron {
-    background: #fff;
-    background-color: rgba(255,255,255,0.95);
-}
-@media (min-width: 768px){
-    .welcome-float {
-        left: 50%;
-        margin-left: -22.5em;
-        width: 45em;
-        top: 1em;
-    }
-}
diff --git a/app/src/frontend/welcome.tsx b/app/src/frontend/welcome.tsx
deleted file mode 100644
index 3a28be4e..00000000
--- a/app/src/frontend/welcome.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import './welcome.css';
-
-const Welcome = () => (
-    <div className="jumbotron welcome-float">
-        <h1 className="h1">Welcome to Colouring London</h1>
-
-        <p className="lead">
-        Colouring London is a citizen science platform collecting information on every
-        building in London, to help make the city more sustainable. We&rsquo;re building it at The
-        Bartlett Centre for Advanced Spatial Analysis, University College London.
-        </p>
-        <p className="lead">
-        Can you help us? We&rsquo;re still at an early stage of development, and we&rsquo;re looking for
-        volunteers of all ages and abilities to test and provide feedback on the site as we
-        build it.
-        </p>
-        <Link to="/view/age.html"
-            className="btn btn-outline-dark btn-lg btn-block">
-            Start Colouring Here!
-        </Link>
-        <img src="images/supporter-logos.png" alt="Colouring London collaborating organisations: The Bartlett UCL, Ordnance Survey, Historic England, Greater London Authority" />
-    </div>
-);
-
-export default Welcome;