Layout Development - Floor-plan

A few weeks ago I created a basic Floor-plan...

After developing and rethinking my layout I updated the floorplan, made it cleaner and created this:

This Floor-plan will most likely be quite close to the finished Layout.