Continued with the shuffling of code around.  Split some of the stuff in util.py off into legacy.py to be eliminated at some point in the future.