Finish moving the regexs to their own types