Adding Otto Event Bus to the project and code refactoring