Improved the i18n files organization