Gradle configuration
Refactoring