A fair amount of re-organizing and cleanup.