2 files changed, 8 insertions, 16 deletions
diff --git a/src/sagas/index.js b/src/sagas/index.js
index 91b8a024..a064de33 100644
--- a/src/sagas/index.js
+++ b/src/sagas/index.js
@@ -2,19 +2,15 @@ import {takeEvery} from "redux-saga/effects";
 import {LOG_IN} from "../actions/auth";
 import {ADD_SIMULATION, DELETE_SIMULATION} from "../actions/simulations";
 import {
-    ADD_MACHINE,
-    ADD_RACK_TO_TILE,
     ADD_TILE,
     CANCEL_NEW_ROOM_CONSTRUCTION,
-    DELETE_MACHINE,
-    DELETE_RACK,
-    DELETE_ROOM,
     DELETE_TILE,
-    EDIT_RACK_NAME,
-    EDIT_ROOM_NAME,
     FETCH_LATEST_DATACENTER,
     START_NEW_ROOM_CONSTRUCTION
-} from "../actions/topology";
+} from "../actions/topology/building";
+import {DELETE_MACHINE} from "../actions/topology/machine";
+import {ADD_MACHINE, DELETE_RACK, EDIT_RACK_NAME} from "../actions/topology/rack";
+import {ADD_RACK_TO_TILE, DELETE_ROOM, EDIT_ROOM_NAME} from "../actions/topology/room";
 import {DELETE_CURRENT_USER, FETCH_AUTHORIZATIONS_OF_CURRENT_USER} from "../actions/users";
 import {onDeleteCurrentUser} from "./profile";
 import {onSimulationAdd, onSimulationDelete} from "./simulations";
diff --git a/src/sagas/topology.js b/src/sagas/topology.js
index 05bebc6c..9eab4368 100644
--- a/src/sagas/topology.js
+++ b/src/sagas/topology.js
@@ -1,19 +1,15 @@
 import {call, put, select} from "redux-saga/effects";
 import {addPropToStoreObject, addToStore} from "../actions/objects";
 import {
-    addMachineSucceeded,
-    addRackToTileSucceeded,
     addTileSucceeded,
     cancelNewRoomConstructionSucceeded,
-    deleteMachineSucceeded,
-    deleteRackSucceeded,
-    deleteRoomSucceeded,
     deleteTileSucceeded,
-    editRackNameSucceeded,
-    editRoomNameSucceeded,
     fetchLatestDatacenterSucceeded,
     startNewRoomConstructionSucceeded
-} from "../actions/topology";
+} from "../actions/topology/building";
+import {deleteMachineSucceeded} from "../actions/topology/machine";
+import {addMachineSucceeded, deleteRackSucceeded, editRackNameSucceeded} from "../actions/topology/rack";
+import {addRackToTileSucceeded, deleteRoomSucceeded, editRoomNameSucceeded} from "../actions/topology/room";
 import {addRoomToDatacenter} from "../api/routes/datacenters";
 import {addTileToRoom, deleteRoom, updateRoom} from "../api/routes/rooms";
 import {