A little refactoring
Formatted code and rearranged entries
Reorganised namespaces a bit. Changed settings to be through Setting objects rather than public properties.