More reshuffling between packages