Make it all gradle and modern