Converted a few legacy listeners to proper modules