Better support for subdirs when using zip format.