Update filename handling

* Don’t worry about extensions (dir.h) default to null character
* Store filename plus extension in metadata
* Default to using filename from metadata if it exists