Fixed path of yml files
Merge branch 'develop'