Make structure of yml files consistent across locales
wip - farsi copy fixes