Merge in new modules from htsworkflow branch.