Bipilesh,Jaideep | refactored server