diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx
index 5020ce44..e78a5dbe 100644
--- a/app/src/frontend/app.tsx
+++ b/app/src/frontend/app.tsx
@@ -6,12 +6,12 @@ import { parse } from 'query-string';
 import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import './app.css';
 
-import BuildingEdit from './building-edit';
-import BuildingView from './building-view';
-import ColouringMap from './map';
+import BuildingEdit from './building/building-edit';
+import BuildingView from './building/building-view';
+import ColouringMap from './map/map';
 import Header from './header';
-import MultiEdit from './multi-edit';
-import Overview from './overview';
+import MultiEdit from './building/multi-edit';
+import Overview from './building/overview';
 
 import AboutPage from './pages/about';
 import ContributorAgreementPage from './pages/contributor-agreement';
diff --git a/app/src/frontend/building-edit.tsx b/app/src/frontend/building/building-edit.tsx
similarity index 99%
rename from app/src/frontend/building-edit.tsx
rename to app/src/frontend/building/building-edit.tsx
index 504219c2..f3a0e65f 100644
--- a/app/src/frontend/building-edit.tsx
+++ b/app/src/frontend/building/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 './components/error-box';
-import InfoBox from './components/info-box';
+import ErrorBox from '../components/error-box';
+import InfoBox from '../components/info-box';
 import Sidebar from './sidebar';
-import Tooltip from './components/tooltip';
-import { SaveIcon } from './components/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/building-view.tsx
similarity index 98%
rename from app/src/frontend/building-view.tsx
rename to app/src/frontend/building/building-view.tsx
index f58c18a9..98eb3c3e 100644
--- a/app/src/frontend/building-view.tsx
+++ b/app/src/frontend/building/building-view.tsx
@@ -3,10 +3,10 @@ import { Link, NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
-import Tooltip from './components/tooltip';
-import InfoBox from './components/info-box';
-import { EditIcon } from './components/icons';
-import { sanitiseURL } from './helpers';
+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/fields-config.json b/app/src/frontend/building/fields-config.json
similarity index 100%
rename from app/src/frontend/fields-config.json
rename to app/src/frontend/building/fields-config.json
diff --git a/app/src/frontend/multi-edit.tsx b/app/src/frontend/building/multi-edit.tsx
similarity index 97%
rename from app/src/frontend/multi-edit.tsx
rename to app/src/frontend/building/multi-edit.tsx
index c0ef4356..45a0fa38 100644
--- a/app/src/frontend/multi-edit.tsx
+++ b/app/src/frontend/building/multi-edit.tsx
@@ -5,8 +5,8 @@ import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
 import CONFIG from './fields-config.json';
-import InfoBox from './components/info-box';
-import { sanitiseURL } from './helpers';
+import InfoBox from '../components/info-box';
+import { sanitiseURL } from '../helpers';
 
 const MultiEdit = (props) => {
     if (!props.user){
diff --git a/app/src/frontend/overview.tsx b/app/src/frontend/building/overview.tsx
similarity index 98%
rename from app/src/frontend/overview.tsx
rename to app/src/frontend/building/overview.tsx
index 64f12ece..8500d435 100644
--- a/app/src/frontend/overview.tsx
+++ b/app/src/frontend/building/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 './components/icons';
+import { EditIcon } from '../components/icons';
 import CONFIG from './fields-config.json';
 
 const Overview = (props) => {
diff --git a/app/src/frontend/sidebar.css b/app/src/frontend/building/sidebar.css
similarity index 100%
rename from app/src/frontend/sidebar.css
rename to app/src/frontend/building/sidebar.css
diff --git a/app/src/frontend/sidebar.tsx b/app/src/frontend/building/sidebar.tsx
similarity index 93%
rename from app/src/frontend/sidebar.tsx
rename to app/src/frontend/building/sidebar.tsx
index 81e0f891..15c76046 100644
--- a/app/src/frontend/sidebar.tsx
+++ b/app/src/frontend/building/sidebar.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import './sidebar.css';
-import { BackIcon } from './components/icons';
+import { BackIcon } from '../components/icons';
 
 const Sidebar = (props) => (
     <div id="legend" className="info-container">
diff --git a/app/src/frontend/legend.css b/app/src/frontend/map/legend.css
similarity index 100%
rename from app/src/frontend/legend.css
rename to app/src/frontend/map/legend.css
diff --git a/app/src/frontend/legend.tsx b/app/src/frontend/map/legend.tsx
similarity index 99%
rename from app/src/frontend/legend.tsx
rename to app/src/frontend/map/legend.tsx
index 21fb1005..eb2016fb 100644
--- a/app/src/frontend/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import './legend.css';
-import { MinorLogo } from './components/logo';
+import { MinorLogo } from '../components/logo';
 
 const LEGEND_CONFIG = {
     location: {
diff --git a/app/src/frontend/map.css b/app/src/frontend/map/map.css
similarity index 100%
rename from app/src/frontend/map.css
rename to app/src/frontend/map/map.css
diff --git a/app/src/frontend/map.tsx b/app/src/frontend/map/map.tsx
similarity index 97%
rename from app/src/frontend/map.tsx
rename to app/src/frontend/map/map.tsx
index 5495568d..78f20aa4 100644
--- a/app/src/frontend/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -2,12 +2,12 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Map, TileLayer, ZoomControl, AttributionControl } from 'react-leaflet-universal';
 
-import '../../node_modules/leaflet/dist/leaflet.css'
+import '../../../node_modules/leaflet/dist/leaflet.css'
 import './map.css'
 
-import { HelpIcon } from './components/icons';
+import { HelpIcon } from '../components/icons';
 import Legend from './legend';
-import { parseCategoryURL } from '../parse';
+import { parseCategoryURL } from '../../parse';
 import SearchBox from './search-box';
 import ThemeSwitcher from './theme-switcher';
 
diff --git a/app/src/frontend/search-box.css b/app/src/frontend/map/search-box.css
similarity index 100%
rename from app/src/frontend/search-box.css
rename to app/src/frontend/map/search-box.css
diff --git a/app/src/frontend/search-box.tsx b/app/src/frontend/map/search-box.tsx
similarity index 99%
rename from app/src/frontend/search-box.tsx
rename to app/src/frontend/map/search-box.tsx
index 7198a0b9..59c3216f 100644
--- a/app/src/frontend/search-box.tsx
+++ b/app/src/frontend/map/search-box.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import './search-box.css';
-import { SearchIcon } from './components/icons';
+import { SearchIcon } from '../components/icons';
 /**
  * Search for location
  */
diff --git a/app/src/frontend/theme-switcher.css b/app/src/frontend/map/theme-switcher.css
similarity index 100%
rename from app/src/frontend/theme-switcher.css
rename to app/src/frontend/map/theme-switcher.css
diff --git a/app/src/frontend/theme-switcher.tsx b/app/src/frontend/map/theme-switcher.tsx
similarity index 100%
rename from app/src/frontend/theme-switcher.tsx
rename to app/src/frontend/map/theme-switcher.tsx
diff --git a/app/src/frontend/pages/about.css b/app/src/frontend/pages/about.css
index 0ee2d1c4..d2e99145 100644
--- a/app/src/frontend/pages/about.css
+++ b/app/src/frontend/pages/about.css
@@ -33,11 +33,11 @@
 }
 .carousel-control.next {
     right: -1em;
-    background-image: url('images/arrow-next.png');
+    background-image: url('../images/arrow-next.png');
 }
 .carousel-control.back {
     left: -1em;
-    background-image: url('images/arrow-back.png');
+    background-image: url('../images/arrow-back.png');
 }
 .carousel-content {
     padding: 0;