Moved TB and HIV constants into their own constant classes