Renamed package and removed unnecessary library.