change dir construct and added i18n component