Update enyo from git and huge refactoring in r2wui