Reorganize parameters.yml