Project cleanup

Make sure gradle to make the gradle integration work for you before merging.