* Renamed package accordingly to its component