Restructured the file system