move some services to external modules