complete population of services struct

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
simplify service creation a bit

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>