Refine remailer discovery
Shuffle key functions to Client from Server