Terminal notifier added for Guard
Refactoring controllers