Merge "factor out templates to yaml files"