Add individual classes for top level objects

Trailing whitespace detected.