Reorganisation
Finished reorg to match best practices.