Generalized number classes to fit standard hirarchy.

Naming issue remains.