Add individual classes for top level objects

Inconsistent indentation detected.