Filesystem no longer singleton