Separated the classes out into their own source files.  Isolated all actions to their appropriate class.  Took a performance hit that I can't identify yet, but the code is much more organized.