75 files changed, 152 insertions, 155 deletions
diff --git a/src/components/map/LoadingScreen.js b/src/components/app/map/LoadingScreen.js
index 3d5753e2..3d5753e2 100644
--- a/src/components/map/LoadingScreen.js
+++ b/src/components/app/map/LoadingScreen.js
diff --git a/src/components/map/MapConstants.js b/src/components/app/map/MapConstants.js
index a0166d15..a0166d15 100644
--- a/src/components/map/MapConstants.js
+++ b/src/components/app/map/MapConstants.js
diff --git a/src/components/map/MapStageComponent.js b/src/components/app/map/MapStageComponent.js
index d3c75da0..271ae64f 100644
--- a/src/components/map/MapStageComponent.js
+++ b/src/components/app/map/MapStageComponent.js
@@ -1,11 +1,11 @@
 import React from "react";
 import {Stage} from "react-konva";
 import {Shortcuts} from "react-shortcuts";
-import MapLayer from "../../containers/map/layers/MapLayer";
-import ObjectHoverLayer from "../../containers/map/layers/ObjectHoverLayer";
-import RoomHoverLayer from "../../containers/map/layers/RoomHoverLayer";
-import jQuery from "../../util/jquery";
-import {NAVBAR_HEIGHT} from "../navigation/Navbar";
+import MapLayer from "../../../containers/app/map/layers/MapLayer";
+import ObjectHoverLayer from "../../../containers/app/map/layers/ObjectHoverLayer";
+import RoomHoverLayer from "../../../containers/app/map/layers/RoomHoverLayer";
+import jQuery from "../../../util/jquery";
+import {NAVBAR_HEIGHT} from "../../navigation/Navbar";
 import {
     MAP_MAX_SCALE,
     MAP_MIN_SCALE,
diff --git a/src/components/map/controls/ExportCanvasComponent.js b/src/components/app/map/controls/ExportCanvasComponent.js
index 2f044ffe..2f044ffe 100644
--- a/src/components/map/controls/ExportCanvasComponent.js
+++ b/src/components/app/map/controls/ExportCanvasComponent.js
diff --git a/src/components/map/controls/ScaleIndicatorComponent.js b/src/components/app/map/controls/ScaleIndicatorComponent.js
index fd9483b5..fd9483b5 100644
--- a/src/components/map/controls/ScaleIndicatorComponent.js
+++ b/src/components/app/map/controls/ScaleIndicatorComponent.js
diff --git a/src/components/map/controls/ScaleIndicatorComponent.sass b/src/components/app/map/controls/ScaleIndicatorComponent.sass
index f2d2b55b..f2d2b55b 100644
--- a/src/components/map/controls/ScaleIndicatorComponent.sass
+++ b/src/components/app/map/controls/ScaleIndicatorComponent.sass
diff --git a/src/components/map/controls/ToolPanelComponent.js b/src/components/app/map/controls/ToolPanelComponent.js
index 19e9f0d9..a065358a 100644
--- a/src/components/map/controls/ToolPanelComponent.js
+++ b/src/components/app/map/controls/ToolPanelComponent.js
@@ -1,5 +1,5 @@
 import React from "react";
-import ZoomControlContainer from "../../../containers/map/controls/ZoomControlContainer";
+import ZoomControlContainer from "../../../../containers/app/map/controls/ZoomControlContainer";
 import ExportCanvasComponent from "./ExportCanvasComponent";
 import "./ToolPanelComponent.css";
 
diff --git a/src/components/map/controls/ToolPanelComponent.sass b/src/components/app/map/controls/ToolPanelComponent.sass
index 996712b3..996712b3 100644
--- a/src/components/map/controls/ToolPanelComponent.sass
+++ b/src/components/app/map/controls/ToolPanelComponent.sass
diff --git a/src/components/map/controls/ZoomControlComponent.js b/src/components/app/map/controls/ZoomControlComponent.js
index c5628d16..c5628d16 100644
--- a/src/components/map/controls/ZoomControlComponent.js
+++ b/src/components/app/map/controls/ZoomControlComponent.js
diff --git a/src/components/map/elements/Backdrop.js b/src/components/app/map/elements/Backdrop.js
index 5022f747..9c01df63 100644
--- a/src/components/map/elements/Backdrop.js
+++ b/src/components/app/map/elements/Backdrop.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {Rect} from "react-konva";
-import {BACKDROP_COLOR} from "../../../util/colors";
+import {BACKDROP_COLOR} from "../../../../util/colors";
 import {MAP_SIZE_IN_PIXELS} from "../MapConstants";
 
 const Backdrop = () => (
diff --git a/src/components/map/elements/GrayLayer.js b/src/components/app/map/elements/GrayLayer.js
index 0cd91df8..c5994d06 100644
--- a/src/components/map/elements/GrayLayer.js
+++ b/src/components/app/map/elements/GrayLayer.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {Rect} from "react-konva";
-import {GRAYED_OUT_AREA_COLOR} from "../../../util/colors";
+import {GRAYED_OUT_AREA_COLOR} from "../../../../util/colors";
 import {MAP_SIZE_IN_PIXELS} from "../MapConstants";
 
 const GrayLayer = ({onClick}) => (
diff --git a/src/components/map/elements/HoverTile.js b/src/components/app/map/elements/HoverTile.js
index b967f2f9..fc12cbdd 100644
--- a/src/components/map/elements/HoverTile.js
+++ b/src/components/app/map/elements/HoverTile.js
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {Rect} from "react-konva";
-import {ROOM_HOVER_INVALID_COLOR, ROOM_HOVER_VALID_COLOR} from "../../../util/colors";
+import {ROOM_HOVER_INVALID_COLOR, ROOM_HOVER_VALID_COLOR} from "../../../../util/colors";
 import {TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const HoverTile = ({pixelX, pixelY, isValid, scale, onClick}) => (
diff --git a/src/components/map/elements/ImageComponent.js b/src/components/app/map/elements/ImageComponent.js
index 486296ea..486296ea 100644
--- a/src/components/map/elements/ImageComponent.js
+++ b/src/components/app/map/elements/ImageComponent.js
diff --git a/src/components/map/elements/RackFillBar.js b/src/components/app/map/elements/RackFillBar.js
index 5b36d442..3a8a1137 100644
--- a/src/components/map/elements/RackFillBar.js
+++ b/src/components/app/map/elements/RackFillBar.js
@@ -6,7 +6,7 @@ import {
     RACK_ENERGY_BAR_FILL_COLOR,
     RACK_SPACE_BAR_BACKGROUND_COLOR,
     RACK_SPACE_BAR_FILL_COLOR
-} from "../../../util/colors";
+} from "../../../../util/colors";
 import {
     OBJECT_BORDER_WIDTH_IN_PIXELS,
     OBJECT_MARGIN_IN_PIXELS,
diff --git a/src/components/map/elements/RoomTile.js b/src/components/app/map/elements/RoomTile.js
index 87dd2f03..11948a7a 100644
--- a/src/components/map/elements/RoomTile.js
+++ b/src/components/app/map/elements/RoomTile.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {Rect} from "react-konva";
-import Shapes from "../../../shapes/index";
+import Shapes from "../../../../shapes/index";
 import {TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const RoomTile = ({tile, color}) => (
diff --git a/src/components/map/elements/TileObject.js b/src/components/app/map/elements/TileObject.js
index 252fcfc2..73bfddba 100644
--- a/src/components/map/elements/TileObject.js
+++ b/src/components/app/map/elements/TileObject.js
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {Rect} from "react-konva";
-import {OBJECT_BORDER_COLOR} from "../../../util/colors";
+import {OBJECT_BORDER_COLOR} from "../../../../util/colors";
 import {OBJECT_BORDER_WIDTH_IN_PIXELS, OBJECT_MARGIN_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const TileObject = ({positionX, positionY, color}) => (
diff --git a/src/components/map/elements/TilePlusIcon.js b/src/components/app/map/elements/TilePlusIcon.js
index 3283c3cd..b96bf0f5 100644
--- a/src/components/map/elements/TilePlusIcon.js
+++ b/src/components/app/map/elements/TilePlusIcon.js
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {Group, Line} from "react-konva";
-import {TILE_PLUS_COLOR} from "../../../util/colors";
+import {TILE_PLUS_COLOR} from "../../../../util/colors";
 import {TILE_PLUS_MARGIN_IN_PIXELS, TILE_PLUS_WIDTH_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const TilePlusIcon = ({pixelX, pixelY, mapScale}) => {
diff --git a/src/components/map/elements/WallSegment.js b/src/components/app/map/elements/WallSegment.js
index b029579b..14efd3fc 100644
--- a/src/components/map/elements/WallSegment.js
+++ b/src/components/app/map/elements/WallSegment.js
@@ -1,7 +1,7 @@
 import React from "react";
 import {Line} from "react-konva";
-import Shapes from "../../../shapes/index";
-import {WALL_COLOR} from "../../../util/colors";
+import Shapes from "../../../../shapes/index";
+import {WALL_COLOR} from "../../../../util/colors";
 import {TILE_SIZE_IN_PIXELS, WALL_WIDTH_IN_PIXELS} from "../MapConstants";
 
 const WallSegment = ({wallSegment}) => {
diff --git a/src/components/map/groups/DatacenterGroup.js b/src/components/app/map/groups/DatacenterGroup.js
index 0830ac4e..1c978360 100644
--- a/src/components/map/groups/DatacenterGroup.js
+++ b/src/components/app/map/groups/DatacenterGroup.js
@@ -1,8 +1,8 @@
 import React from "react";
 import {Group} from "react-konva";
-import GrayContainer from "../../../containers/map/GrayContainer";
-import RoomContainer from "../../../containers/map/RoomContainer";
-import Shapes from "../../../shapes/index";
+import GrayContainer from "../../../../containers/app/map/GrayContainer";
+import RoomContainer from "../../../../containers/app/map/RoomContainer";
+import Shapes from "../../../../shapes/index";
 
 const DatacenterGroup = ({datacenter, interactionLevel}) => {
     if (!datacenter) {
diff --git a/src/components/map/groups/GridGroup.js b/src/components/app/map/groups/GridGroup.js
index bd2a78c3..b3c6e1d5 100644
--- a/src/components/map/groups/GridGroup.js
+++ b/src/components/app/map/groups/GridGroup.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {Group, Line} from "react-konva";
-import {GRID_COLOR} from "../../../util/colors";
+import {GRID_COLOR} from "../../../../util/colors";
 import {GRID_LINE_WIDTH_IN_PIXELS, MAP_SIZE, MAP_SIZE_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants";
 
 const MAP_COORDINATE_ENTRIES = Array.from(new Array(MAP_SIZE), (x, i) => i);
diff --git a/src/components/map/groups/RackGroup.js b/src/components/app/map/groups/RackGroup.js
index 7bf8855e..233d0c20 100644
--- a/src/components/map/groups/RackGroup.js
+++ b/src/components/app/map/groups/RackGroup.js
@@ -1,10 +1,10 @@
 import React from "react";
 import {Group} from "react-konva";
-import RackEnergyFillContainer from "../../../containers/map/RackEnergyFillContainer";
-import RackSpaceFillContainer from "../../../containers/map/RackSpaceFillContainer";
-import Shapes from "../../../shapes/index";
-import {RACK_BACKGROUND_COLOR} from "../../../util/colors";
-import {convertLoadToSimulationColor} from "../../../util/simulation-load";
+import RackEnergyFillContainer from "../../../../containers/app/map/RackEnergyFillContainer";
+import RackSpaceFillContainer from "../../../../containers/app/map/RackSpaceFillContainer";
+import Shapes from "../../../../shapes/index";
+import {RACK_BACKGROUND_COLOR} from "../../../../util/colors";
+import {convertLoadToSimulationColor} from "../../../../util/simulation-load";
 import TileObject from "../elements/TileObject";
 
 const RackGroup = ({tile, inSimulation, rackLoad}) => {
diff --git a/src/components/map/groups/RoomGroup.js b/src/components/app/map/groups/RoomGroup.js
index 7c8392aa..18a6bd84 100644
--- a/src/components/map/groups/RoomGroup.js
+++ b/src/components/app/map/groups/RoomGroup.js
@@ -1,9 +1,9 @@
 import React from "react";
 import {Group} from "react-konva";
-import GrayContainer from "../../../containers/map/GrayContainer";
-import TileContainer from "../../../containers/map/TileContainer";
-import WallContainer from "../../../containers/map/WallContainer";
-import Shapes from "../../../shapes/index";
+import GrayContainer from "../../../../containers/app/map/GrayContainer";
+import TileContainer from "../../../../containers/app/map/TileContainer";
+import WallContainer from "../../../../containers/app/map/WallContainer";
+import Shapes from "../../../../shapes/index";
 
 const RoomGroup = ({room, interactionLevel, currentRoomInConstruction, onClick}) => {
     if (currentRoomInConstruction === room.id) {
diff --git a/src/components/map/groups/TileGroup.js b/src/components/app/map/groups/TileGroup.js
index b88867b3..c41e78a4 100644
--- a/src/components/map/groups/TileGroup.js
+++ b/src/components/app/map/groups/TileGroup.js
@@ -1,10 +1,10 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {Group} from "react-konva";
-import RackContainer from "../../../containers/map/RackContainer";
-import Shapes from "../../../shapes/index";
-import {ROOM_DEFAULT_COLOR, ROOM_IN_CONSTRUCTION_COLOR} from "../../../util/colors";
-import {convertLoadToSimulationColor} from "../../../util/simulation-load";
+import RackContainer from "../../../../containers/app/map/RackContainer";
+import Shapes from "../../../../shapes/index";
+import {ROOM_DEFAULT_COLOR, ROOM_IN_CONSTRUCTION_COLOR} from "../../../../util/colors";
+import {convertLoadToSimulationColor} from "../../../../util/simulation-load";
 import RoomTile from "../elements/RoomTile";
 
 const TileGroup = ({tile, newTile, inSimulation, roomLoad, onClick}) => {
diff --git a/src/components/map/groups/WallGroup.js b/src/components/app/map/groups/WallGroup.js
index f21d91a5..6de22523 100644
--- a/src/components/map/groups/WallGroup.js
+++ b/src/components/app/map/groups/WallGroup.js
@@ -1,8 +1,8 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {Group} from "react-konva";
-import Shapes from "../../../shapes/index";
-import {deriveWallLocations} from "../../../util/tile-calculations";
+import Shapes from "../../../../shapes/index";
+import {deriveWallLocations} from "../../../../util/tile-calculations";
 import WallSegment from "../elements/WallSegment";
 
 const WallGroup = ({tiles}) => {
diff --git a/src/components/map/layers/HoverLayerComponent.js b/src/components/app/map/layers/HoverLayerComponent.js
index aa2e8313..aa2e8313 100644
--- a/src/components/map/layers/HoverLayerComponent.js
+++ b/src/components/app/map/layers/HoverLayerComponent.js
diff --git a/src/components/map/layers/MapLayerComponent.js b/src/components/app/map/layers/MapLayerComponent.js
index 3476bbc9..c969249c 100644
--- a/src/components/map/layers/MapLayerComponent.js
+++ b/src/components/app/map/layers/MapLayerComponent.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Group, Layer} from "react-konva";
-import DatacenterContainer from "../../../containers/map/DatacenterContainer";
+import DatacenterContainer from "../../../../containers/app/map/DatacenterContainer";
 import Backdrop from "../elements/Backdrop";
 import GridGroup from "../groups/GridGroup";
 
diff --git a/src/components/map/layers/ObjectHoverLayerComponent.js b/src/components/app/map/layers/ObjectHoverLayerComponent.js
index aa79f8c3..aa79f8c3 100644
--- a/src/components/map/layers/ObjectHoverLayerComponent.js
+++ b/src/components/app/map/layers/ObjectHoverLayerComponent.js
diff --git a/src/components/map/layers/RoomHoverLayerComponent.js b/src/components/app/map/layers/RoomHoverLayerComponent.js
index 2133c8d8..2133c8d8 100644
--- a/src/components/map/layers/RoomHoverLayerComponent.js
+++ b/src/components/app/map/layers/RoomHoverLayerComponent.js
diff --git a/src/components/sidebars/Sidebar.js b/src/components/app/sidebars/Sidebar.js
index 00e3607a..00e3607a 100644
--- a/src/components/sidebars/Sidebar.js
+++ b/src/components/app/sidebars/Sidebar.js
diff --git a/src/components/sidebars/Sidebar.sass b/src/components/app/sidebars/Sidebar.sass
index b987ef07..4d0e5f1e 100644
--- a/src/components/sidebars/Sidebar.sass
+++ b/src/components/app/sidebars/Sidebar.sass
@@ -1,5 +1,5 @@
-@import ../../style-globals/_variables.sass
-@import ../../style-globals/_mixins.sass
+@import ../../../style-globals/_variables.sass
+@import ../../../style-globals/_mixins.sass
 
 .sidebar-collapse-button
   position: absolute
diff --git a/src/components/sidebars/elements/LoadBarComponent.js b/src/components/app/sidebars/elements/LoadBarComponent.js
index 65f94b3d..65f94b3d 100644
--- a/src/components/sidebars/elements/LoadBarComponent.js
+++ b/src/components/app/sidebars/elements/LoadBarComponent.js
diff --git a/src/components/sidebars/elements/LoadChartComponent.js b/src/components/app/sidebars/elements/LoadChartComponent.js
index a4e14a24..19d58f77 100644
--- a/src/components/sidebars/elements/LoadChartComponent.js
+++ b/src/components/app/sidebars/elements/LoadChartComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {VictoryAxis, VictoryChart, VictoryLine, VictoryScatter} from "victory";
-import {convertSecondsToFormattedTime} from "../../../util/date-time";
+import {convertSecondsToFormattedTime} from "../../../../util/date-time";
 
 const LoadChartComponent = ({data, currentTick}) => (
     <div className="mt-1">
diff --git a/src/components/sidebars/simulation/ExperimentMetadataComponent.js b/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js
index 3649045b..3649045b 100644
--- a/src/components/sidebars/simulation/ExperimentMetadataComponent.js
+++ b/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js
diff --git a/src/components/sidebars/simulation/LoadMetricComponent.js b/src/components/app/sidebars/simulation/LoadMetricComponent.js
index d9a1ed71..e72e6b67 100644
--- a/src/components/sidebars/simulation/LoadMetricComponent.js
+++ b/src/components/app/sidebars/simulation/LoadMetricComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "../../../util/colors";
-import {LOAD_NAME_MAP} from "../../../util/simulation-load";
+import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "../../../../util/colors";
+import {LOAD_NAME_MAP} from "../../../../util/simulation-load";
 
 const LoadMetricComponent = ({loadMetric}) => (
     <div>
diff --git a/src/components/sidebars/simulation/SimulationSidebarComponent.js b/src/components/app/sidebars/simulation/SimulationSidebarComponent.js
index 5cb83c2c..92651dfc 100644
--- a/src/components/sidebars/simulation/SimulationSidebarComponent.js
+++ b/src/components/app/sidebars/simulation/SimulationSidebarComponent.js
@@ -1,7 +1,7 @@
 import React from "react";
-import ExperimentMetadataContainer from "../../../containers/sidebars/simulation/ExperimentMetadataContainer";
-import LoadMetricContainer from "../../../containers/sidebars/simulation/LoadMetricContainer";
-import TraceContainer from "../../../containers/sidebars/simulation/TraceContainer";
+import ExperimentMetadataContainer from "../../../../containers/app/sidebars/simulation/ExperimentMetadataContainer";
+import LoadMetricContainer from "../../../../containers/app/sidebars/simulation/LoadMetricContainer";
+import TraceContainer from "../../../../containers/app/sidebars/simulation/TraceContainer";
 import Sidebar from "../Sidebar";
 import "./SimulationSidebarComponent.css";
 
diff --git a/src/components/sidebars/simulation/SimulationSidebarComponent.sass b/src/components/app/sidebars/simulation/SimulationSidebarComponent.sass
index 82af97fa..82af97fa 100644
--- a/src/components/sidebars/simulation/SimulationSidebarComponent.sass
+++ b/src/components/app/sidebars/simulation/SimulationSidebarComponent.sass
diff --git a/src/components/sidebars/simulation/TaskComponent.js b/src/components/app/sidebars/simulation/TaskComponent.js
index 03b6a279..f7f65817 100644
--- a/src/components/sidebars/simulation/TaskComponent.js
+++ b/src/components/app/sidebars/simulation/TaskComponent.js
@@ -1,6 +1,6 @@
 import approx from "approximate-number";
 import React from "react";
-import {convertSecondsToFormattedTime} from "../../../util/date-time";
+import {convertSecondsToFormattedTime} from "../../../../util/date-time";
 
 const TaskComponent = ({task, flopsLeft}) => {
     let stateInfo;
diff --git a/src/components/sidebars/simulation/TraceComponent.js b/src/components/app/sidebars/simulation/TraceComponent.js
index ffb470ba..b43a8cea 100644
--- a/src/components/sidebars/simulation/TraceComponent.js
+++ b/src/components/app/sidebars/simulation/TraceComponent.js
@@ -1,5 +1,5 @@
 import React from "react";
-import TaskContainer from "../../../containers/sidebars/simulation/TaskContainer";
+import TaskContainer from "../../../../containers/app/sidebars/simulation/TaskContainer";
 
 const TraceComponent = ({jobs}) => (
     <div>
diff --git a/src/components/sidebars/topology/NameComponent.js b/src/components/app/sidebars/topology/NameComponent.js
index d663f4ae..d663f4ae 100644
--- a/src/components/sidebars/topology/NameComponent.js
+++ b/src/components/app/sidebars/topology/NameComponent.js
diff --git a/src/components/sidebars/topology/TopologySidebarComponent.js b/src/components/app/sidebars/topology/TopologySidebarComponent.js
index b61c7e3c..ff4260a9 100644
--- a/src/components/sidebars/topology/TopologySidebarComponent.js
+++ b/src/components/app/sidebars/topology/TopologySidebarComponent.js
@@ -1,8 +1,8 @@
 import React from "react";
-import BuildingSidebarContainer from "../../../containers/sidebars/topology/building/BuildingSidebarContainer";
-import MachineSidebarContainer from "../../../containers/sidebars/topology/machine/MachineSidebarContainer";
-import RackSidebarContainer from "../../../containers/sidebars/topology/rack/RackSidebarContainer";
-import RoomSidebarContainer from "../../../containers/sidebars/topology/room/RoomSidebarContainer";
+import BuildingSidebarContainer from "../../../../containers/app/sidebars/topology/building/BuildingSidebarContainer";
+import MachineSidebarContainer from "../../../../containers/app/sidebars/topology/machine/MachineSidebarContainer";
+import RackSidebarContainer from "../../../../containers/app/sidebars/topology/rack/RackSidebarContainer";
+import RoomSidebarContainer from "../../../../containers/app/sidebars/topology/room/RoomSidebarContainer";
 import Sidebar from "../Sidebar";
 
 const TopologySidebarComponent = ({interactionLevel}) => {
diff --git a/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js b/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js
new file mode 100644
index 00000000..2bf81a48
--- /dev/null
+++ b/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js
@@ -0,0 +1,19 @@
+import React from "react";
+import NewRoomConstructionContainer from "../../../../../containers/app/sidebars/topology/building/NewRoomConstructionContainer";
+
+const BuildingSidebarComponent = ({inSimulation}) => {
+    return (
+        <div>
+            <h2>Building</h2>
+            {inSimulation ?
+                <div className="alert alert-info">
+                    <span className="fa fa-info-circle mr-2"/>
+                    <strong>Click on individual rooms</strong> to see their stats!
+                </div> :
+                <NewRoomConstructionContainer/>
+            }
+        </div>
+    );
+};
+
+export default BuildingSidebarComponent;
diff --git a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js b/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
index d89b0ac0..d89b0ac0 100644
--- a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js
+++ b/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
diff --git a/src/components/sidebars/topology/machine/BackToRackComponent.js b/src/components/app/sidebars/topology/machine/BackToRackComponent.js
index 19e33904..19e33904 100644
--- a/src/components/sidebars/topology/machine/BackToRackComponent.js
+++ b/src/components/app/sidebars/topology/machine/BackToRackComponent.js
diff --git a/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js b/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js
new file mode 100644
index 00000000..7ba08352
--- /dev/null
+++ b/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js
@@ -0,0 +1,10 @@
+import React from "react";
+
+const DeleteMachineComponent = ({onClick}) => (
+    <div className="btn btn-danger btn-block" onClick={onClick}>
+        <span className="fa fa-trash mr-2"/>
+        Delete this machine
+    </div>
+);
+
+export default DeleteMachineComponent;
diff --git a/src/components/sidebars/topology/machine/MachineNameComponent.js b/src/components/app/sidebars/topology/machine/MachineNameComponent.js
index 321e350d..321e350d 100644
--- a/src/components/sidebars/topology/machine/MachineNameComponent.js
+++ b/src/components/app/sidebars/topology/machine/MachineNameComponent.js
diff --git a/src/components/app/sidebars/topology/machine/MachineSidebarComponent.js b/src/components/app/sidebars/topology/machine/MachineSidebarComponent.js
new file mode 100644
index 00000000..cf4db80e
--- /dev/null
+++ b/src/components/app/sidebars/topology/machine/MachineSidebarComponent.js
@@ -0,0 +1,26 @@
+import React from "react";
+import LoadBarContainer from "../../../../../containers/app/sidebars/elements/LoadBarContainer";
+import LoadChartContainer from "../../../../../containers/app/sidebars/elements/LoadChartContainer";
+import BackToRackContainer from "../../../../../containers/app/sidebars/topology/machine/BackToRackContainer";
+import DeleteMachineContainer from "../../../../../containers/app/sidebars/topology/machine/DeleteMachineContainer";
+import MachineNameContainer from "../../../../../containers/app/sidebars/topology/machine/MachineNameContainer";
+import UnitTabsContainer from "../../../../../containers/app/sidebars/topology/machine/UnitTabsContainer";
+
+const MachineSidebarComponent = ({inSimulation, machineId}) => {
+    return (
+        <div>
+            <MachineNameContainer/>
+            <BackToRackContainer/>
+            {inSimulation ?
+                <div>
+                    <LoadBarContainer objectType="machine" objectId={machineId}/>
+                    <LoadChartContainer objectType="machine" objectId={machineId}/>
+                </div> :
+                <DeleteMachineContainer/>
+            }
+            <UnitTabsContainer/>
+        </div>
+    );
+};
+
+export default MachineSidebarComponent;
diff --git a/src/components/sidebars/topology/machine/UnitAddComponent.js b/src/components/app/sidebars/topology/machine/UnitAddComponent.js
index f16700df..f16700df 100644
--- a/src/components/sidebars/topology/machine/UnitAddComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitAddComponent.js
diff --git a/src/components/sidebars/topology/machine/UnitComponent.js b/src/components/app/sidebars/topology/machine/UnitComponent.js
index c734f508..c734f508 100644
--- a/src/components/sidebars/topology/machine/UnitComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitComponent.js
diff --git a/src/components/sidebars/topology/machine/UnitListComponent.js b/src/components/app/sidebars/topology/machine/UnitListComponent.js
index 307edc0a..683f6023 100644
--- a/src/components/sidebars/topology/machine/UnitListComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitListComponent.js
@@ -1,5 +1,5 @@
 import React from "react";
-import UnitContainer from "../../../../containers/sidebars/topology/machine/UnitContainer";
+import UnitContainer from "../../../../../containers/app/sidebars/topology/machine/UnitContainer";
 
 const UnitListComponent = ({unitType, unitIds, inSimulation}) => (
     <ul className="list-group mt-1">
diff --git a/src/components/sidebars/topology/machine/UnitTabsComponent.js b/src/components/app/sidebars/topology/machine/UnitTabsComponent.js
index a7692ecf..2113d6d8 100644
--- a/src/components/sidebars/topology/machine/UnitTabsComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitTabsComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import UnitAddContainer from "../../../../containers/sidebars/topology/machine/UnitAddContainer";
-import UnitListContainer from "../../../../containers/sidebars/topology/machine/UnitListContainer";
+import UnitAddContainer from "../../../../../containers/app/sidebars/topology/machine/UnitAddContainer";
+import UnitListContainer from "../../../../../containers/app/sidebars/topology/machine/UnitListContainer";
 
 const UnitTabsComponent = ({inSimulation}) => (
     <div>
diff --git a/src/components/sidebars/topology/rack/BackToRoomComponent.js b/src/components/app/sidebars/topology/rack/BackToRoomComponent.js
index 267001c6..267001c6 100644
--- a/src/components/sidebars/topology/rack/BackToRoomComponent.js
+++ b/src/components/app/sidebars/topology/rack/BackToRoomComponent.js
diff --git a/src/components/app/sidebars/topology/rack/DeleteRackComponent.js b/src/components/app/sidebars/topology/rack/DeleteRackComponent.js
new file mode 100644
index 00000000..b268bd72
--- /dev/null
+++ b/src/components/app/sidebars/topology/rack/DeleteRackComponent.js
@@ -0,0 +1,10 @@
+import React from "react";
+
+const DeleteRackComponent = ({onClick}) => (
+    <div className="btn btn-danger btn-block" onClick={onClick}>
+        <span className="fa fa-trash mr-2"/>
+        Delete this rack
+    </div>
+);
+
+export default DeleteRackComponent;
diff --git a/src/components/sidebars/topology/rack/EmptySlotComponent.js b/src/components/app/sidebars/topology/rack/EmptySlotComponent.js
index 08665072..08665072 100644
--- a/src/components/sidebars/topology/rack/EmptySlotComponent.js
+++ b/src/components/app/sidebars/topology/rack/EmptySlotComponent.js
diff --git a/src/components/sidebars/topology/rack/MachineComponent.js b/src/components/app/sidebars/topology/rack/MachineComponent.js
index c9211115..545bb916 100644
--- a/src/components/sidebars/topology/rack/MachineComponent.js
+++ b/src/components/app/sidebars/topology/rack/MachineComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import Shapes from "../../../../shapes";
-import {convertLoadToSimulationColor} from "../../../../util/simulation-load";
+import Shapes from "../../../../../shapes";
+import {convertLoadToSimulationColor} from "../../../../../util/simulation-load";
 
 const UnitIcon = ({id, type}) => (
     <div>
diff --git a/src/components/sidebars/topology/rack/MachineListComponent.js b/src/components/app/sidebars/topology/rack/MachineListComponent.js
index 41522e36..fcb90d66 100644
--- a/src/components/sidebars/topology/rack/MachineListComponent.js
+++ b/src/components/app/sidebars/topology/rack/MachineListComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import EmptySlotContainer from "../../../../containers/sidebars/topology/rack/EmptySlotContainer";
-import MachineContainer from "../../../../containers/sidebars/topology/rack/MachineContainer";
+import EmptySlotContainer from "../../../../../containers/app/sidebars/topology/rack/EmptySlotContainer";
+import MachineContainer from "../../../../../containers/app/sidebars/topology/rack/MachineContainer";
 import "./MachineListComponent.css";
 
 const MachineListComponent = ({machineIds}) => {
diff --git a/src/components/sidebars/topology/rack/MachineListComponent.sass b/src/components/app/sidebars/topology/rack/MachineListComponent.sass
index bbcfe696..bbcfe696 100644
--- a/src/components/sidebars/topology/rack/MachineListComponent.sass
+++ b/src/components/app/sidebars/topology/rack/MachineListComponent.sass
diff --git a/src/components/sidebars/topology/rack/RackNameComponent.js b/src/components/app/sidebars/topology/rack/RackNameComponent.js
index ee8d194b..ee8d194b 100644
--- a/src/components/sidebars/topology/rack/RackNameComponent.js
+++ b/src/components/app/sidebars/topology/rack/RackNameComponent.js
diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.js b/src/components/app/sidebars/topology/rack/RackSidebarComponent.js
index 6a36972f..f563a52f 100644
--- a/src/components/sidebars/topology/rack/RackSidebarComponent.js
+++ b/src/components/app/sidebars/topology/rack/RackSidebarComponent.js
@@ -1,10 +1,10 @@
 import React from "react";
-import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer";
-import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer";
-import BackToRoomContainer from "../../../../containers/sidebars/topology/rack/BackToRoomContainer";
-import DeleteRackContainer from "../../../../containers/sidebars/topology/rack/DeleteRackContainer";
-import MachineListContainer from "../../../../containers/sidebars/topology/rack/MachineListContainer";
-import RackNameContainer from "../../../../containers/sidebars/topology/rack/RackNameContainer";
+import LoadBarContainer from "../../../../../containers/app/sidebars/elements/LoadBarContainer";
+import LoadChartContainer from "../../../../../containers/app/sidebars/elements/LoadChartContainer";
+import BackToRoomContainer from "../../../../../containers/app/sidebars/topology/rack/BackToRoomContainer";
+import DeleteRackContainer from "../../../../../containers/app/sidebars/topology/rack/DeleteRackContainer";
+import MachineListContainer from "../../../../../containers/app/sidebars/topology/rack/MachineListContainer";
+import RackNameContainer from "../../../../../containers/app/sidebars/topology/rack/RackNameContainer";
 import "./RackSidebarComponent.css";
 
 const RackSidebarComponent = ({inSimulation, rackId}) => {
diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.sass b/src/components/app/sidebars/topology/rack/RackSidebarComponent.sass
index 822804bc..822804bc 100644
--- a/src/components/sidebars/topology/rack/RackSidebarComponent.sass
+++ b/src/components/app/sidebars/topology/rack/RackSidebarComponent.sass
diff --git a/src/components/sidebars/topology/room/BackToBuildingComponent.js b/src/components/app/sidebars/topology/room/BackToBuildingComponent.js
index 81384ba5..81384ba5 100644
--- a/src/components/sidebars/topology/room/BackToBuildingComponent.js
+++ b/src/components/app/sidebars/topology/room/BackToBuildingComponent.js
diff --git a/src/components/app/sidebars/topology/room/DeleteRoomComponent.js b/src/components/app/sidebars/topology/room/DeleteRoomComponent.js
new file mode 100644
index 00000000..3f41eac0
--- /dev/null
+++ b/src/components/app/sidebars/topology/room/DeleteRoomComponent.js
@@ -0,0 +1,10 @@
+import React from "react";
+
+const DeleteRoomComponent = ({onClick}) => (
+    <div className="btn btn-danger btn-block" onClick={onClick}>
+        <span className="fa fa-trash mr-2"/>
+        Delete this room
+    </div>
+);
+
+export default DeleteRoomComponent;
diff --git a/src/components/sidebars/topology/room/RackConstructionComponent.js b/src/components/app/sidebars/topology/room/RackConstructionComponent.js
index 9bfe28ce..9bfe28ce 100644
--- a/src/components/sidebars/topology/room/RackConstructionComponent.js
+++ b/src/components/app/sidebars/topology/room/RackConstructionComponent.js
diff --git a/src/components/sidebars/topology/room/RoomNameComponent.js b/src/components/app/sidebars/topology/room/RoomNameComponent.js
index 4d3e41cc..4d3e41cc 100644
--- a/src/components/sidebars/topology/room/RoomNameComponent.js
+++ b/src/components/app/sidebars/topology/room/RoomNameComponent.js
diff --git a/src/components/sidebars/topology/room/RoomSidebarComponent.js b/src/components/app/sidebars/topology/room/RoomSidebarComponent.js
index fb3c3296..53857408 100644
--- a/src/components/sidebars/topology/room/RoomSidebarComponent.js
+++ b/src/components/app/sidebars/topology/room/RoomSidebarComponent.js
@@ -1,11 +1,11 @@
 import React from "react";
-import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer";
-import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer";
-import BackToBuildingContainer from "../../../../containers/sidebars/topology/room/BackToBuildingContainer";
-import DeleteRoomContainer from "../../../../containers/sidebars/topology/room/DeleteRoomContainer";
-import RackConstructionContainer from "../../../../containers/sidebars/topology/room/RackConstructionContainer";
-import RoomNameContainer from "../../../../containers/sidebars/topology/room/RoomNameContainer";
-import RoomTypeContainer from "../../../../containers/sidebars/topology/room/RoomTypeContainer";
+import LoadBarContainer from "../../../../../containers/app/sidebars/elements/LoadBarContainer";
+import LoadChartContainer from "../../../../../containers/app/sidebars/elements/LoadChartContainer";
+import BackToBuildingContainer from "../../../../../containers/app/sidebars/topology/room/BackToBuildingContainer";
+import DeleteRoomContainer from "../../../../../containers/app/sidebars/topology/room/DeleteRoomContainer";
+import RackConstructionContainer from "../../../../../containers/app/sidebars/topology/room/RackConstructionContainer";
+import RoomNameContainer from "../../../../../containers/app/sidebars/topology/room/RoomNameContainer";
+import RoomTypeContainer from "../../../../../containers/app/sidebars/topology/room/RoomTypeContainer";
 
 const RoomSidebarComponent = ({roomId, roomType, inSimulation}) => {
     let allowedObjects;
diff --git a/src/components/sidebars/topology/room/RoomTypeComponent.js b/src/components/app/sidebars/topology/room/RoomTypeComponent.js
index c48c185a..d42eefb6 100644
--- a/src/components/sidebars/topology/room/RoomTypeComponent.js
+++ b/src/components/app/sidebars/topology/room/RoomTypeComponent.js
@@ -1,5 +1,5 @@
 import React from "react";
-import {ROOM_TYPE_TO_NAME_MAP} from "../../../../util/room-types";
+import {ROOM_TYPE_TO_NAME_MAP} from "../../../../../util/room-types";
 
 const RoomTypeComponent = ({roomType}) => (
     <p className="lead">
diff --git a/src/components/timeline/PlayButtonComponent.js b/src/components/app/timeline/PlayButtonComponent.js
index 6ec70cc3..6ec70cc3 100644
--- a/src/components/timeline/PlayButtonComponent.js
+++ b/src/components/app/timeline/PlayButtonComponent.js
diff --git a/src/components/timeline/Timeline.sass b/src/components/app/timeline/Timeline.sass
index bfb1a4d7..5003e80d 100644
--- a/src/components/timeline/Timeline.sass
+++ b/src/components/app/timeline/Timeline.sass
@@ -1,5 +1,5 @@
-@import ../../style-globals/_variables.sass
-@import ../../style-globals/_mixins.sass
+@import ../../../style-globals/_variables.sass
+@import ../../../style-globals/_mixins.sass
 
 $container-size: 500px
 $play-btn-size: 40px
diff --git a/src/components/timeline/TimelineComponent.js b/src/components/app/timeline/TimelineComponent.js
index 119c396b..950a25bd 100644
--- a/src/components/timeline/TimelineComponent.js
+++ b/src/components/app/timeline/TimelineComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import TimelineControlsContainer from "../../containers/timeline/TimelineControlsContainer";
-import TimelineLabelsContainer from "../../containers/timeline/TimelineLabelsContainer";
+import TimelineControlsContainer from "../../../containers/app/timeline/TimelineControlsContainer";
+import TimelineLabelsContainer from "../../../containers/app/timeline/TimelineLabelsContainer";
 import "./Timeline.css";
 
 class TimelineComponent extends React.Component {
diff --git a/src/components/timeline/TimelineControlsComponent.js b/src/components/app/timeline/TimelineControlsComponent.js
index bd98afc3..72fc4a60 100644
--- a/src/components/timeline/TimelineControlsComponent.js
+++ b/src/components/app/timeline/TimelineControlsComponent.js
@@ -1,6 +1,6 @@
 import React from "react";
-import PlayButtonContainer from "../../containers/timeline/PlayButtonContainer";
-import {convertTickToPercentage} from "../../util/timeline";
+import PlayButtonContainer from "../../../containers/app/timeline/PlayButtonContainer";
+import {convertTickToPercentage} from "../../../util/timeline";
 
 class TimelineControlsComponent extends React.Component {
     onTimelineClick(e) {
diff --git a/src/components/timeline/TimelineLabelsComponent.js b/src/components/app/timeline/TimelineLabelsComponent.js
index 1f6053a1..e795691f 100644
--- a/src/components/timeline/TimelineLabelsComponent.js
+++ b/src/components/app/timeline/TimelineLabelsComponent.js
@@ -1,5 +1,5 @@
 import React from "react";
-import {convertSecondsToFormattedTime} from "../../util/date-time";
+import {convertSecondsToFormattedTime} from "../../../util/date-time";
 
 const TimelineLabelsComponent = ({currentTick, lastSimulatedTick}) => (
     <div className="timeline-labels">
diff --git a/src/components/sidebars/topology/building/BuildingSidebarComponent.js b/src/components/sidebars/topology/building/BuildingSidebarComponent.js
deleted file mode 100644
index 835943f2..00000000
--- a/src/components/sidebars/topology/building/BuildingSidebarComponent.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-import NewRoomConstructionContainer from "../../../../containers/sidebars/topology/building/NewRoomConstructionContainer";
-
-const BuildingSidebarComponent = ({inSimulation}) => {
-    return (
-        <div>
-            <h2>Building</h2>
-            {inSimulation ?
-                undefined :
-                <NewRoomConstructionContainer/>
-            }
-        </div>
-    );
-};
-
-export default BuildingSidebarComponent;
diff --git a/src/components/sidebars/topology/machine/DeleteMachineComponent.js b/src/components/sidebars/topology/machine/DeleteMachineComponent.js
deleted file mode 100644
index 14713158..00000000
--- a/src/components/sidebars/topology/machine/DeleteMachineComponent.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-
-const DeleteMachineComponent = ({onClick}) => {
-    return (
-        <div className="btn btn-danger btn-block" onClick={onClick}>
-            <span className="fa fa-trash mr-2"/>
-            Delete this machine
-        </div>
-    );
-};
-
-export default DeleteMachineComponent;
diff --git a/src/components/sidebars/topology/machine/MachineSidebarComponent.js b/src/components/sidebars/topology/machine/MachineSidebarComponent.js
deleted file mode 100644
index e8009c34..00000000
--- a/src/components/sidebars/topology/machine/MachineSidebarComponent.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from "react";
-import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer";
-import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer";
-import BackToRackContainer from "../../../../containers/sidebars/topology/machine/BackToRackContainer";
-import DeleteMachineContainer from "../../../../containers/sidebars/topology/machine/DeleteMachineContainer";
-import MachineNameContainer from "../../../../containers/sidebars/topology/machine/MachineNameContainer";
-import UnitTabsContainer from "../../../../containers/sidebars/topology/machine/UnitTabsContainer";
-
-const MachineSidebarComponent = ({inSimulation, machineId}) => {
-    return (
-        <div>
-            <MachineNameContainer/>
-            <BackToRackContainer/>
-            {inSimulation ?
-                <div>
-                    <LoadBarContainer objectType="machine" objectId={machineId}/>
-                    <LoadChartContainer objectType="machine" objectId={machineId}/>
-                </div> :
-                <DeleteMachineContainer/>
-            }
-            <UnitTabsContainer/>
-        </div>
-    );
-};
-
-export default MachineSidebarComponent;
diff --git a/src/components/sidebars/topology/rack/DeleteRackComponent.js b/src/components/sidebars/topology/rack/DeleteRackComponent.js
deleted file mode 100644
index 06c45048..00000000
--- a/src/components/sidebars/topology/rack/DeleteRackComponent.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-
-const DeleteRackComponent = ({onClick}) => {
-    return (
-        <div className="btn btn-danger btn-block" onClick={onClick}>
-            <span className="fa fa-trash mr-2"/>
-            Delete this rack
-        </div>
-    );
-};
-
-export default DeleteRackComponent;
diff --git a/src/components/sidebars/topology/room/DeleteRoomComponent.js b/src/components/sidebars/topology/room/DeleteRoomComponent.js
deleted file mode 100644
index 72bb6a83..00000000
--- a/src/components/sidebars/topology/room/DeleteRoomComponent.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-
-const DeleteRoomComponent = ({onClick}) => {
-    return (
-        <div className="btn btn-danger btn-block" onClick={onClick}>
-            <span className="fa fa-trash mr-2"/>
-            Delete this room
-        </div>
-    );
-};
-
-export default DeleteRoomComponent;