Cleaned Up Classes

During the initial creation all the classes were in a single file. Split
the classes out to files.