moved server services in appropriate package