Move the web service related classes to different package