Changes to work with new FileSystem API
More FileSystem API workarounds
Rebuild of zip file