Renamed package to meet Java guidelines