Reorganised config files