Revert "Conditional sub-directory for download"

This reverts commit c9ed938cffb6cb8728614506f5695c939abe26ed.
Conditional sub-directory for download [implementing differently]