Move team definitions into the new qh file