fix fail get fatch entry from zip file
Merge remote-tracking branch 'origin/restructure' into restructure