Remove Baubles
Split gradle conf/build and automate some more things