Getting it ready for gradle