Move Diagnosis and ErrorCodes to common.