Package reorganization