Renamed package + fixes