Gradle wrapper
build.gradle tweaks
Cleanups