Move adding TBS drivers out of configure