Protobuffers restructured.