Continue making the room structure more flexible. Bunch of refactoring.