Re-org and misc messing about.