Gradle-ize and Maven-ize
Fix minor codestyle issues