snapshot: move pb to snappb; remove clusterId

fix these imports.