Factored out customisations, reorganised config.