Reorganising config data to be less loose lipped