Move registry to util.
Clean up ServerProtocol per RFC 3785.