added support for zip file structure v2