Refactoring Smart-Notifier files to Notifier files