Should we put the classes in separate files?  This one is debatable.  I like the rule that if the class is visible on the outside then it should be in a separate file.