Reorganize so cleveref sees \newtheorem{}