Add individual classes for top level objects

Line is too long. [83/80]