Package structure reorg.