Zabbix Refactoring and Fixes 2014-03-18