and cifs/envoy shares modularized