Moving to pb.* as foundation for RM (and subsequent services)