FS.Store namespace and related changes