Reestructuring the packages.