Refactored some things and fixed creation of ZipArchive