*: move srv into pkg discovery

/cc @barakmich @kelseyhightower 
@kelseyhightower I think we do not need to do this anymore after your effort, right?