Structure and filenames a bit more in sync with H5BP