Renamed packages. Removed unused code.