Reorganize i18n support