Handle .zips more gracefully

Currently all the old .zips just get moved to a single folder.

If there are naming conflicts, those are resolved, however, not gracefully. This can present confusion.

Along with this, multiple versions of the same .zip end up there. (i.e. if there is a zip inside of a zip, both end up in the .zips folder.)