zlib: split up to match original source tree