Added target "zip"
Refactoring