Move everything from zip file so that we don't have a zip in a zip