snapshot: move pb to snappb; remove clusterId