Rejig packages to match updated physical architecture