modularize site and add suport for i18n