Move NotificationListeners to separate class