more gradle build refactoring