refactor zip catalogue