jaideep,bipilesh| refactoring server