renamed package, changed return values to simple types