Move Error Code into ErrorCodes class for each module, and add more error messages for contract module