Cleanup: Merge PeerFinder API headers into one
Don't use callbacks to activate PeerFinder slots