Remove content dispostion line so that the actual filename can be saved.

- While here, also fix and tar up the proper directory