*.yml-files reorganized