Refactor ZIP file creation