reorganize folders and rebuilded zip files