Improve unarchive to deal with changing extract name.

* Some folders get extracted to a folder that isn't just the archive
name minus the extension. Dealing with it now.