refactoring the gradle file too