Move zip to top-level zip.h and include in gamgee.h