Move promises to the leaf packages