Slight reorganization of sample yaml.