Reorganized helper classes somewhat.