Flatten the fs hierarchy, and make some filenames more precise.