Big fat refactoring with EventBus and more Guice
Code cleanup