Reorganized config.yml