Restructuring i18n