Simplify class names.

Modules are removed and the titlecased class names
are now underscored.