Correct error in config.yml and re-organize/clean-up configuration