Restructure web service