Move Yaml to Single File Format