Various organization

Removed some rooms, the lobby is general discussion.