Re-organized the structure of the classes. Continuing to do housecleaning, still not quite how I want it.