Refactoring
Refactoring
Add EventBus Injection, start adding Service and Scenario