Reorganizing config.