gradle
a bit of cleanup and gradle support