Fixed up zip file creation to create 2 zips