Move alerts to modules