Split out rest-discovery package