Settings reorg.
Lots of reorg.