Baselayout

The meat is in 5f187bb

Needs some more testing and I won't be merging this before the current pending release is out to avoid extra disruption to the tree but this basically what we need to get /usr moving forward.