zlib: Tidy directory layout