TUP-2403: refactor the duplicated packages.

TUP-2403: refactor the duplicated packages.