Fixed zap unzip to folder named zap