Major restructure, step 5

More of a clean-up and a config for ?diamonds