did some refactoring of the gradle file.