Improved Gradle usage

see commits