Updates to the class structure.

Signed-off-by: Kevin Herda <kherda@sgcmail.com>