Moved to ZipArchive
Fixed some slightly broken things
Simplified method