Update gamgee.h and move zip to zip.h