Un-HTML5ify the base class from unused attributes

Also clean up the class definitions and re-order them.