TUP-2403: refactor the duplicated packages.

PL merge it.