Package reshuffling #448