Modified class path, and removed shit