Reorganized, moved listeners to fresh class