Move Rooms to room package