Upgrade to guava 15, changed main class names, added java8 package