Refactoring - WebService

organization and refactoring webservice class