Adding template listener for options UI
Refactoring event names
Refactoring event names
Refactoring listener directories