Renamed to main software package