Protobuf structure refactoring.