Move ZMAP support do dedicated package