Code clean up
Update structure of translation files