Restructuring the file system. --matthew