Further refactor of regimen code to support TB regimens