updated yaml files' structure