Nicer gradle files ;)

Really happy with the changes