Cleaned up "class" files to make it more obvious the structure of the different classes.

Signed-off-by: someone9999 <brandonmabey@gmail.com>