Switch to submodules for translations
Switch to submodules for translations, part 2