rearrange and update VAMP tree to match VAMP 2.0