Add email to orderer and customer
Refactor order spec