Improve the zip directory structure