Renamed classes and removed extra packages.