Refactor: move translation concern to new folder
Fix translation files

Regeneration can incorrectly remove keys