Move zip stuff into lib