major reorg for packaging