Fix empty zip error, better storage tree