restructure notifiers some