change yaml to json partially
rename files. fix test for json