Clean package names up and stuff