Readding i18n as non submodule