Make Gen7b as the combined ver for that expression
Co-Authored-By: sciresm <sciresm@users.noreply.github.com> Co-Authored-By: Matt <sora10pls@users.noreply.github.com> Co-Authored-By: Archit Date <architdate@gmail.com>
Update usages
no functional change, just putting stuff in a more appropriate folder