Reorganized helper classes