Now using constants for folder names instead of hard-coded values
Fixed problem that in some cases duplicate entries could be added to the source zip (errors were silently swallowed)