Update to use new file system