Renamed package
Some cleanup