Room reconfiguration completed

Finally got around to add new rooms and spread things out a bit. This was started in this post

See update to our Location and Rules related to this map changes too!