refactored some classes
Merge pull request #140 from EricWittmann/gwt-classes

refactored some classes