reworking for multiple source packages