Restructure component and container directories

48 files changed, 81 insertions, 81 deletions

diff --git a/src/containers/map/DatacenterContainer.js b/src/containers/app/map/DatacenterContainer.js
index b56adbac..6859f2d8 100644
--- a/src/containers/map/DatacenterContainer.js
+++ b/src/containers/app/map/DatacenterContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import DatacenterGroup from "../../components/map/groups/DatacenterGroup";
+import DatacenterGroup from "../../../components/app/map/groups/DatacenterGroup";
 
 const mapStateToProps = state => {
     if (state.currentDatacenterId === -1) {
diff --git a/src/containers/map/GrayContainer.js b/src/containers/app/map/GrayContainer.js
index bc1dcc59..a22ef3c8 100644
--- a/src/containers/map/GrayContainer.js
+++ b/src/containers/app/map/GrayContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goDownOneInteractionLevel} from "../../actions/interaction-level";
-import GrayLayer from "../../components/map/elements/GrayLayer";
+import {goDownOneInteractionLevel} from "../../../actions/interaction-level";
+import GrayLayer from "../../../components/app/map/elements/GrayLayer";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/map/MapStage.js b/src/containers/app/map/MapStage.js
index 62dd7463..e0c85651 100644
--- a/src/containers/map/MapStage.js
+++ b/src/containers/app/map/MapStage.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {setMapDimensions, setMapPosition, setMapScale} from "../../actions/map";
-import MapStageComponent from "../../components/map/MapStageComponent";
+import {setMapDimensions, setMapPosition, setMapScale} from "../../../actions/map";
+import MapStageComponent from "../../../components/app/map/MapStageComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/map/RackContainer.js b/src/containers/app/map/RackContainer.js
index 60df9aaf..38f01efc 100644
--- a/src/containers/map/RackContainer.js
+++ b/src/containers/app/map/RackContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import RackGroup from "../../components/map/groups/RackGroup";
-import {getStateLoad} from "../../util/simulation-load";
+import RackGroup from "../../../components/app/map/groups/RackGroup";
+import {getStateLoad} from "../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
     const inSimulation = state.currentExperimentId !== -1;
diff --git a/src/containers/map/RackEnergyFillContainer.js b/src/containers/app/map/RackEnergyFillContainer.js
index 0143ce80..d83dc386 100644
--- a/src/containers/map/RackEnergyFillContainer.js
+++ b/src/containers/app/map/RackEnergyFillContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import RackFillBar from "../../components/map/elements/RackFillBar";
+import RackFillBar from "../../../components/app/map/elements/RackFillBar";
 
 const mapStateToProps = (state, ownProps) => {
     let energyConsumptionTotal = 0;
diff --git a/src/containers/map/RackSpaceFillContainer.js b/src/containers/app/map/RackSpaceFillContainer.js
index d6be823f..bbcf4e2e 100644
--- a/src/containers/map/RackSpaceFillContainer.js
+++ b/src/containers/app/map/RackSpaceFillContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import RackFillBar from "../../components/map/elements/RackFillBar";
+import RackFillBar from "../../../components/app/map/elements/RackFillBar";
 
 const mapStateToProps = (state, ownProps) => {
     const machineIds = state.objects.rack[state.objects.tile[ownProps.tileId].objectId].machineIds;
diff --git a/src/containers/map/RoomContainer.js b/src/containers/app/map/RoomContainer.js
index 9edcb096..c8e146d6 100644
--- a/src/containers/map/RoomContainer.js
+++ b/src/containers/app/map/RoomContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goFromBuildingToRoom} from "../../actions/interaction-level";
-import RoomGroup from "../../components/map/groups/RoomGroup";
+import {goFromBuildingToRoom} from "../../../actions/interaction-level";
+import RoomGroup from "../../../components/app/map/groups/RoomGroup";
 
 const mapStateToProps = (state, ownProps) => {
     return {
diff --git a/src/containers/map/TileContainer.js b/src/containers/app/map/TileContainer.js
index 75fac5ad..299016d1 100644
--- a/src/containers/map/TileContainer.js
+++ b/src/containers/app/map/TileContainer.js
@@ -1,7 +1,7 @@
 import {connect} from "react-redux";
-import {goFromRoomToRack} from "../../actions/interaction-level";
-import TileGroup from "../../components/map/groups/TileGroup";
-import {getStateLoad} from "../../util/simulation-load";
+import {goFromRoomToRack} from "../../../actions/interaction-level";
+import TileGroup from "../../../components/app/map/groups/TileGroup";
+import {getStateLoad} from "../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
     const tile = state.objects.tile[ownProps.tileId];
diff --git a/src/containers/map/WallContainer.js b/src/containers/app/map/WallContainer.js
index f8ccb2e9..0ce8875a 100644
--- a/src/containers/map/WallContainer.js
+++ b/src/containers/app/map/WallContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import WallGroup from "../../components/map/groups/WallGroup";
+import WallGroup from "../../../components/app/map/groups/WallGroup";
 
 const mapStateToProps = (state, ownProps) => {
     return {
diff --git a/src/containers/map/controls/ScaleIndicatorContainer.js b/src/containers/app/map/controls/ScaleIndicatorContainer.js
index 06cc96f5..12596c9c 100644
--- a/src/containers/map/controls/ScaleIndicatorContainer.js
+++ b/src/containers/app/map/controls/ScaleIndicatorContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import ScaleIndicatorComponent from "../../../components/map/controls/ScaleIndicatorComponent";
+import ScaleIndicatorComponent from "../../../../components/app/map/controls/ScaleIndicatorComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/map/controls/ZoomControlContainer.js b/src/containers/app/map/controls/ZoomControlContainer.js
index 280ede4f..b9cf0a63 100644
--- a/src/containers/map/controls/ZoomControlContainer.js
+++ b/src/containers/app/map/controls/ZoomControlContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {setMapScale} from "../../../actions/map";
-import ZoomControlComponent from "../../../components/map/controls/ZoomControlComponent";
+import {setMapScale} from "../../../../actions/map";
+import ZoomControlComponent from "../../../../components/app/map/controls/ZoomControlComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/map/layers/MapLayer.js b/src/containers/app/map/layers/MapLayer.js
index 9ef5c662..ea3a0b57 100644
--- a/src/containers/map/layers/MapLayer.js
+++ b/src/containers/app/map/layers/MapLayer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import MapLayerComponent from "../../../components/map/layers/MapLayerComponent";
+import MapLayerComponent from "../../../../components/app/map/layers/MapLayerComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/map/layers/ObjectHoverLayer.js b/src/containers/app/map/layers/ObjectHoverLayer.js
index b0201257..d905fd42 100644
--- a/src/containers/map/layers/ObjectHoverLayer.js
+++ b/src/containers/app/map/layers/ObjectHoverLayer.js
@@ -1,7 +1,7 @@
 import {connect} from "react-redux";
-import {addRackToTile} from "../../../actions/topology/room";
-import ObjectHoverLayerComponent from "../../../components/map/layers/ObjectHoverLayerComponent";
-import {findTileWithPosition} from "../../../util/tile-calculations";
+import {addRackToTile} from "../../../../actions/topology/room";
+import ObjectHoverLayerComponent from "../../../../components/app/map/layers/ObjectHoverLayerComponent";
+import {findTileWithPosition} from "../../../../util/tile-calculations";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/map/layers/RoomHoverLayer.js b/src/containers/app/map/layers/RoomHoverLayer.js
index 528e45d3..801ce549 100644
--- a/src/containers/map/layers/RoomHoverLayer.js
+++ b/src/containers/app/map/layers/RoomHoverLayer.js
@@ -1,11 +1,11 @@
 import {connect} from "react-redux";
-import {toggleTileAtLocation} from "../../../actions/topology/building";
-import RoomHoverLayerComponent from "../../../components/map/layers/RoomHoverLayerComponent";
+import {toggleTileAtLocation} from "../../../../actions/topology/building";
+import RoomHoverLayerComponent from "../../../../components/app/map/layers/RoomHoverLayerComponent";
 import {
     deriveValidNextTilePositions,
     findPositionInPositions,
     findPositionInRooms
-} from "../../../util/tile-calculations";
+} from "../../../../util/tile-calculations";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/elements/LoadBarContainer.js b/src/containers/app/sidebars/elements/LoadBarContainer.js
index 08aec93c..ccaf1729 100644
--- a/src/containers/sidebars/elements/LoadBarContainer.js
+++ b/src/containers/app/sidebars/elements/LoadBarContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import LoadBarComponent from "../../../components/sidebars/elements/LoadBarComponent";
-import {getStateLoad} from "../../../util/simulation-load";
+import LoadBarComponent from "../../../../components/app/sidebars/elements/LoadBarComponent";
+import {getStateLoad} from "../../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
     let percent = 0;
diff --git a/src/containers/sidebars/elements/LoadChartContainer.js b/src/containers/app/sidebars/elements/LoadChartContainer.js
index 33b99a51..227a4fd5 100644
--- a/src/containers/sidebars/elements/LoadChartContainer.js
+++ b/src/containers/app/sidebars/elements/LoadChartContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import LoadChartComponent from "../../../components/sidebars/elements/LoadChartComponent";
-import {getStateLoad} from "../../../util/simulation-load";
+import LoadChartComponent from "../../../../components/app/sidebars/elements/LoadChartComponent";
+import {getStateLoad} from "../../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
     const data = [];
diff --git a/src/containers/sidebars/simulation/ExperimentMetadataContainer.js b/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js
index 55323f11..a5e403ce 100644
--- a/src/containers/sidebars/simulation/ExperimentMetadataContainer.js
+++ b/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import ExperimentMetadataComponent from "../../../components/sidebars/simulation/ExperimentMetadataComponent";
+import ExperimentMetadataComponent from "../../../../components/app/sidebars/simulation/ExperimentMetadataComponent";
 
 const mapStateToProps = state => {
     if (!state.objects.experiment[state.currentExperimentId]) {
diff --git a/src/containers/sidebars/simulation/LoadMetricContainer.js b/src/containers/app/sidebars/simulation/LoadMetricContainer.js
index 71a50163..5ce3542c 100644
--- a/src/containers/sidebars/simulation/LoadMetricContainer.js
+++ b/src/containers/app/sidebars/simulation/LoadMetricContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import LoadMetricComponent from "../../../components/sidebars/simulation/LoadMetricComponent";
+import LoadMetricComponent from "../../../../components/app/sidebars/simulation/LoadMetricComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/simulation/TaskContainer.js b/src/containers/app/sidebars/simulation/TaskContainer.js
index df06b5b8..357bd7ed 100644
--- a/src/containers/sidebars/simulation/TaskContainer.js
+++ b/src/containers/app/sidebars/simulation/TaskContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import TaskComponent from "../../../components/sidebars/simulation/TaskComponent";
+import TaskComponent from "../../../../components/app/sidebars/simulation/TaskComponent";
 
 const mapStateToProps = (state, ownProps) => {
     let flopsLeft = state.objects.task[ownProps.taskId].totalFlopCount;
diff --git a/src/containers/sidebars/simulation/TraceContainer.js b/src/containers/app/sidebars/simulation/TraceContainer.js
index 6539823d..7955f313 100644
--- a/src/containers/sidebars/simulation/TraceContainer.js
+++ b/src/containers/app/sidebars/simulation/TraceContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import TraceComponent from "../../../components/sidebars/simulation/TraceComponent";
+import TraceComponent from "../../../../components/app/sidebars/simulation/TraceComponent";
 
 const mapStateToProps = state => {
     if (!state.objects.experiment[state.currentExperimentId] ||
diff --git a/src/containers/sidebars/topology/TopologySidebar.js b/src/containers/app/sidebars/topology/TopologySidebar.js
index 6ed836da..ac59f5cc 100644
--- a/src/containers/sidebars/topology/TopologySidebar.js
+++ b/src/containers/app/sidebars/topology/TopologySidebar.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import TopologySidebarComponent from "../../../components/sidebars/topology/TopologySidebarComponent";
+import TopologySidebarComponent from "../../../../components/app/sidebars/topology/TopologySidebarComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/building/BuildingSidebarContainer.js b/src/containers/app/sidebars/topology/building/BuildingSidebarContainer.js
index 28bd0b93..ce7a308a 100644
--- a/src/containers/sidebars/topology/building/BuildingSidebarContainer.js
+++ b/src/containers/app/sidebars/topology/building/BuildingSidebarContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import BuildingSidebarComponent from "../../../../components/sidebars/topology/building/BuildingSidebarComponent";
+import BuildingSidebarComponent from "../../../../../components/app/sidebars/topology/building/BuildingSidebarComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/building/NewRoomConstructionContainer.js b/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js
index 0236522d..3ec1349b 100644
--- a/src/containers/sidebars/topology/building/NewRoomConstructionContainer.js
+++ b/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js
@@ -3,8 +3,8 @@ import {
     cancelNewRoomConstruction,
     finishNewRoomConstruction,
     startNewRoomConstruction
-} from "../../../../actions/topology/building";
-import StartNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/NewRoomConstructionComponent";
+} from "../../../../../actions/topology/building";
+import StartNewRoomConstructionComponent from "../../../../../components/app/sidebars/topology/building/NewRoomConstructionComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/machine/BackToRackContainer.js b/src/containers/app/sidebars/topology/machine/BackToRackContainer.js
index 9f31fab9..f0ac9220 100644
--- a/src/containers/sidebars/topology/machine/BackToRackContainer.js
+++ b/src/containers/app/sidebars/topology/machine/BackToRackContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goDownOneInteractionLevel} from "../../../../actions/interaction-level";
-import BackToRackComponent from "../../../../components/sidebars/topology/machine/BackToRackComponent";
+import {goDownOneInteractionLevel} from "../../../../../actions/interaction-level";
+import BackToRackComponent from "../../../../../components/app/sidebars/topology/machine/BackToRackComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/machine/DeleteMachineContainer.js b/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
index 0c18598b..bfdde179 100644
--- a/src/containers/sidebars/topology/machine/DeleteMachineContainer.js
+++ b/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {openDeleteMachineModal} from "../../../../actions/modals/topology";
-import DeleteMachineComponent from "../../../../components/sidebars/topology/machine/DeleteMachineComponent";
+import {openDeleteMachineModal} from "../../../../../actions/modals/topology";
+import DeleteMachineComponent from "../../../../../components/app/sidebars/topology/machine/DeleteMachineComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/machine/MachineNameContainer.js b/src/containers/app/sidebars/topology/machine/MachineNameContainer.js
index 8e5413ef..9d23dcb6 100644
--- a/src/containers/sidebars/topology/machine/MachineNameContainer.js
+++ b/src/containers/app/sidebars/topology/machine/MachineNameContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import MachineNameComponent from "../../../../components/sidebars/topology/machine/MachineNameComponent";
+import MachineNameComponent from "../../../../../components/app/sidebars/topology/machine/MachineNameComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/machine/MachineSidebarContainer.js b/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
index f99fc05e..5c28248c 100644
--- a/src/containers/sidebars/topology/machine/MachineSidebarContainer.js
+++ b/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import MachineSidebarComponent from "../../../../components/sidebars/topology/machine/MachineSidebarComponent";
+import MachineSidebarComponent from "../../../../../components/app/sidebars/topology/machine/MachineSidebarComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/machine/UnitAddContainer.js b/src/containers/app/sidebars/topology/machine/UnitAddContainer.js
index 66e35030..f194ebcf 100644
--- a/src/containers/sidebars/topology/machine/UnitAddContainer.js
+++ b/src/containers/app/sidebars/topology/machine/UnitAddContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {addUnit} from "../../../../actions/topology/machine";
-import UnitAddComponent from "../../../../components/sidebars/topology/machine/UnitAddComponent";
+import {addUnit} from "../../../../../actions/topology/machine";
+import UnitAddComponent from "../../../../../components/app/sidebars/topology/machine/UnitAddComponent";
 
 const mapStateToProps = (state, ownProps) => {
     return {
diff --git a/src/containers/sidebars/topology/machine/UnitContainer.js b/src/containers/app/sidebars/topology/machine/UnitContainer.js
index 33001b99..12024d5a 100644
--- a/src/containers/sidebars/topology/machine/UnitContainer.js
+++ b/src/containers/app/sidebars/topology/machine/UnitContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {deleteUnit} from "../../../../actions/topology/machine";
-import UnitComponent from "../../../../components/sidebars/topology/machine/UnitComponent";
+import {deleteUnit} from "../../../../../actions/topology/machine";
+import UnitComponent from "../../../../../components/app/sidebars/topology/machine/UnitComponent";
 
 const mapStateToProps = (state, ownProps) => {
     return {
diff --git a/src/containers/sidebars/topology/machine/UnitListContainer.js b/src/containers/app/sidebars/topology/machine/UnitListContainer.js
index 9aed3f60..e351c63c 100644
--- a/src/containers/sidebars/topology/machine/UnitListContainer.js
+++ b/src/containers/app/sidebars/topology/machine/UnitListContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import UnitListComponent from "../../../../components/sidebars/topology/machine/UnitListComponent";
+import UnitListComponent from "../../../../../components/app/sidebars/topology/machine/UnitListComponent";
 
 const mapStateToProps = (state, ownProps) => {
     return {
diff --git a/src/containers/sidebars/topology/machine/UnitTabsContainer.js b/src/containers/app/sidebars/topology/machine/UnitTabsContainer.js
index c92afcb5..46952c74 100644
--- a/src/containers/sidebars/topology/machine/UnitTabsContainer.js
+++ b/src/containers/app/sidebars/topology/machine/UnitTabsContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import UnitTabsComponent from "../../../../components/sidebars/topology/machine/UnitTabsComponent";
+import UnitTabsComponent from "../../../../../components/app/sidebars/topology/machine/UnitTabsComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/rack/BackToRoomContainer.js b/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js
index 876078d5..01653540 100644
--- a/src/containers/sidebars/topology/rack/BackToRoomContainer.js
+++ b/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goDownOneInteractionLevel} from "../../../../actions/interaction-level";
-import BackToRoomComponent from "../../../../components/sidebars/topology/rack/BackToRoomComponent";
+import {goDownOneInteractionLevel} from "../../../../../actions/interaction-level";
+import BackToRoomComponent from "../../../../../components/app/sidebars/topology/rack/BackToRoomComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/rack/DeleteRackContainer.js b/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
index f95c48b8..cf225558 100644
--- a/src/containers/sidebars/topology/rack/DeleteRackContainer.js
+++ b/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {openDeleteRackModal} from "../../../../actions/modals/topology";
-import DeleteRackComponent from "../../../../components/sidebars/topology/rack/DeleteRackComponent";
+import {openDeleteRackModal} from "../../../../../actions/modals/topology";
+import DeleteRackComponent from "../../../../../components/app/sidebars/topology/rack/DeleteRackComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/rack/EmptySlotContainer.js b/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js
index aa0673d1..b8f5e553 100644
--- a/src/containers/sidebars/topology/rack/EmptySlotContainer.js
+++ b/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {addMachine} from "../../../../actions/topology/rack";
-import EmptySlotComponent from "../../../../components/sidebars/topology/rack/EmptySlotComponent";
+import {addMachine} from "../../../../../actions/topology/rack";
+import EmptySlotComponent from "../../../../../components/app/sidebars/topology/rack/EmptySlotComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/rack/MachineContainer.js b/src/containers/app/sidebars/topology/rack/MachineContainer.js
index 7406d191..cd15ddd0 100644
--- a/src/containers/sidebars/topology/rack/MachineContainer.js
+++ b/src/containers/app/sidebars/topology/rack/MachineContainer.js
@@ -1,7 +1,7 @@
 import {connect} from "react-redux";
-import {goFromRackToMachine} from "../../../../actions/interaction-level";
-import MachineComponent from "../../../../components/sidebars/topology/rack/MachineComponent";
-import {getStateLoad} from "../../../../util/simulation-load";
+import {goFromRackToMachine} from "../../../../../actions/interaction-level";
+import MachineComponent from "../../../../../components/app/sidebars/topology/rack/MachineComponent";
+import {getStateLoad} from "../../../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
     const machine = state.objects.machine[ownProps.machineId];
diff --git a/src/containers/sidebars/topology/rack/MachineListContainer.js b/src/containers/app/sidebars/topology/rack/MachineListContainer.js
index eef2a4e1..dbedfbb2 100644
--- a/src/containers/sidebars/topology/rack/MachineListContainer.js
+++ b/src/containers/app/sidebars/topology/rack/MachineListContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import MachineListComponent from "../../../../components/sidebars/topology/rack/MachineListComponent";
+import MachineListComponent from "../../../../../components/app/sidebars/topology/rack/MachineListComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/rack/RackNameContainer.js b/src/containers/app/sidebars/topology/rack/RackNameContainer.js
index 34416938..49a58155 100644
--- a/src/containers/sidebars/topology/rack/RackNameContainer.js
+++ b/src/containers/app/sidebars/topology/rack/RackNameContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {openEditRackNameModal} from "../../../../actions/modals/topology";
-import RackNameComponent from "../../../../components/sidebars/topology/rack/RackNameComponent";
+import {openEditRackNameModal} from "../../../../../actions/modals/topology";
+import RackNameComponent from "../../../../../components/app/sidebars/topology/rack/RackNameComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/rack/RackSidebarContainer.js b/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js
index 4652b968..ba51ee4a 100644
--- a/src/containers/sidebars/topology/rack/RackSidebarContainer.js
+++ b/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import RackSidebarComponent from "../../../../components/sidebars/topology/rack/RackSidebarComponent";
+import RackSidebarComponent from "../../../../../components/app/sidebars/topology/rack/RackSidebarComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/room/BackToBuildingContainer.js b/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js
index 5ab772f6..a6366552 100644
--- a/src/containers/sidebars/topology/room/BackToBuildingContainer.js
+++ b/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goDownOneInteractionLevel} from "../../../../actions/interaction-level";
-import BackToBuildingComponent from "../../../../components/sidebars/topology/room/BackToBuildingComponent";
+import {goDownOneInteractionLevel} from "../../../../../actions/interaction-level";
+import BackToBuildingComponent from "../../../../../components/app/sidebars/topology/room/BackToBuildingComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/room/DeleteRoomContainer.js b/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
index 23a8fa0a..0c9aef1c 100644
--- a/src/containers/sidebars/topology/room/DeleteRoomContainer.js
+++ b/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {openDeleteRoomModal} from "../../../../actions/modals/topology";
-import DeleteRoomComponent from "../../../../components/sidebars/topology/room/DeleteRoomComponent";
+import {openDeleteRoomModal} from "../../../../../actions/modals/topology";
+import DeleteRoomComponent from "../../../../../components/app/sidebars/topology/room/DeleteRoomComponent";
 
 const mapDispatchToProps = dispatch => {
     return {
diff --git a/src/containers/sidebars/topology/room/RackConstructionContainer.js b/src/containers/app/sidebars/topology/room/RackConstructionContainer.js
index 0c539c75..f06a3ab2 100644
--- a/src/containers/sidebars/topology/room/RackConstructionContainer.js
+++ b/src/containers/app/sidebars/topology/room/RackConstructionContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {startRackConstruction, stopRackConstruction} from "../../../../actions/topology/room";
-import RackConstructionComponent from "../../../../components/sidebars/topology/room/RackConstructionComponent";
+import {startRackConstruction, stopRackConstruction} from "../../../../../actions/topology/room";
+import RackConstructionComponent from "../../../../../components/app/sidebars/topology/room/RackConstructionComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/room/RoomNameContainer.js b/src/containers/app/sidebars/topology/room/RoomNameContainer.js
index 7b9dc249..c1f7f397 100644
--- a/src/containers/sidebars/topology/room/RoomNameContainer.js
+++ b/src/containers/app/sidebars/topology/room/RoomNameContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {openEditRoomNameModal} from "../../../../actions/modals/topology";
-import RoomNameComponent from "../../../../components/sidebars/topology/room/RoomNameComponent";
+import {openEditRoomNameModal} from "../../../../../actions/modals/topology";
+import RoomNameComponent from "../../../../../components/app/sidebars/topology/room/RoomNameComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/room/RoomSidebarContainer.js b/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js
index 6dded3e7..6371e6a1 100644
--- a/src/containers/sidebars/topology/room/RoomSidebarContainer.js
+++ b/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import RoomSidebarComponent from "../../../../components/sidebars/topology/room/RoomSidebarComponent";
+import RoomSidebarComponent from "../../../../../components/app/sidebars/topology/room/RoomSidebarComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/sidebars/topology/room/RoomTypeContainer.js b/src/containers/app/sidebars/topology/room/RoomTypeContainer.js
index 392bc479..8cc1126a 100644
--- a/src/containers/sidebars/topology/room/RoomTypeContainer.js
+++ b/src/containers/app/sidebars/topology/room/RoomTypeContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import RoomTypeComponent from "../../../../components/sidebars/topology/room/RoomTypeComponent";
+import RoomTypeComponent from "../../../../../components/app/sidebars/topology/room/RoomTypeComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/timeline/PlayButtonContainer.js b/src/containers/app/timeline/PlayButtonContainer.js
index 6d4a9f25..3db5302c 100644
--- a/src/containers/timeline/PlayButtonContainer.js
+++ b/src/containers/app/timeline/PlayButtonContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {pauseSimulation, playSimulation} from "../../actions/simulation/playback";
-import PlayButtonComponent from "../../components/timeline/PlayButtonComponent";
+import {pauseSimulation, playSimulation} from "../../../actions/simulation/playback";
+import PlayButtonComponent from "../../../components/app/timeline/PlayButtonComponent";
 
 const mapStateToProps = state => {
     return {
diff --git a/src/containers/timeline/TimelineContainer.js b/src/containers/app/timeline/TimelineContainer.js
index d52d5477..46491f9b 100644
--- a/src/containers/timeline/TimelineContainer.js
+++ b/src/containers/app/timeline/TimelineContainer.js
@@ -1,8 +1,8 @@
 import {connect} from "react-redux";
-import {pauseSimulation} from "../../actions/simulation/playback";
-import {incrementTick} from "../../actions/simulation/tick";
-import {setCurrentDatacenter} from "../../actions/topology/building";
-import TimelineComponent from "../../components/timeline/TimelineComponent";
+import {pauseSimulation} from "../../../actions/simulation/playback";
+import {incrementTick} from "../../../actions/simulation/tick";
+import {setCurrentDatacenter} from "../../../actions/topology/building";
+import TimelineComponent from "../../../components/app/timeline/TimelineComponent";
 
 const mapStateToProps = state => {
     let sections = [];
diff --git a/src/containers/timeline/TimelineControlsContainer.js b/src/containers/app/timeline/TimelineControlsContainer.js
index e7f27fbf..e91a0aca 100644
--- a/src/containers/timeline/TimelineControlsContainer.js
+++ b/src/containers/app/timeline/TimelineControlsContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
-import {goToTick} from "../../actions/simulation/tick";
-import TimelineControlsComponent from "../../components/timeline/TimelineControlsComponent";
+import {goToTick} from "../../../actions/simulation/tick";
+import TimelineControlsComponent from "../../../components/app/timeline/TimelineControlsComponent";
 
 const mapStateToProps = state => {
     let sectionTicks = [];
diff --git a/src/containers/timeline/TimelineLabelsContainer.js b/src/containers/app/timeline/TimelineLabelsContainer.js
index b6ff0774..3dfad9f2 100644
--- a/src/containers/timeline/TimelineLabelsContainer.js
+++ b/src/containers/app/timeline/TimelineLabelsContainer.js
@@ -1,5 +1,5 @@
 import {connect} from "react-redux";
-import TimelineLabelsComponent from "../../components/timeline/TimelineLabelsComponent";
+import TimelineLabelsComponent from "../../../components/app/timeline/TimelineLabelsComponent";
 
 const mapStateToProps = state => {
     return {