re-structuring, going for gwt