Refactor EChequeServer and slight change to ECheque