More file system changes

Still more to be done