i18 extension + better system organization