Finished refactoring the application architecture, added bus listener
for custom events.