Classpath changes

Includes Google stuff