Reorganizing everything to allow for shading guava and jclouds