Enhance unpack IM zip logic to support multiple folder hierachy structure