use yaml insead of json
fix wrong file name
Merge branch use-yaml