Renamed packages so both can be used at the same time