Fixed GWT compilation issue by refactoring the package structure some
more