continued: de-tangling file name namespaces; getting hard to separate client and datastore manager methods