Filename containing Filetype

If display names contain file extensions, they should not be added a second time.

If display names are not unique, the generated zip files should be able to handle this.