fixed class path
consolidate common into gwt