Tidied up file system apis