Some cleanup
Gradle and Packer roles