Gradle Build refactored