move more code up into service module from beans