Re-organize the Zabbix related bits