Consolidated CLASS_IDS and CLASS_PARAMS dicts into one.

I added the CLASS_IDS info to CLASS_PARAMS and then generated
CLASS_IDS automatically from CLASS_PARAMS.  Cleaner and better.