Reorganize ProtocolAdmin and ProtocolClient