restructure some files
Further i18n support for #26
Further i18n support for #26