Add ExceptionNotifier
Some refactoring and cleanup, mainly for model