refactoring towards multiple rooms
Organized imports everywhere