broke zendserver stuff out into proper groups
broke zendserver stuff out into proper groups