Clean up of GWT modules
Velocity comment for better IntelliJ support
Import missing modules