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

Resolves #829.

Apologies again for any temporary inconveniences this causes.