Refactoring (move to Errai + GWT)