Remove elvis
Use FileSystem for zip file operation