Reorganised config