Use original file names instead of .dat files

[Stephen]

Use the original filename in the filesystem instead of renaming it to fileID.dat

Proposed solution would be to name the files "fileID-fileName" which would prevent files from having duplicate file names.