Separate CCMP & CALT versions
Categorize template classes from A-C