changed properties managment for zip-file file structure
Merge remote-tracking branch 'origin/master'