Reorganize settings.yml