refactored gradle build files