move web service out of endpoints