tidy up packages
GiveItAllAGo: doesn't add java library to classpath, as that is now added by default