Refactored zipFolder