Fixed YAML organization