Start of guice integration, also start of switch to eventbus model
Major refactoring and integration of guice
Removed alot of unused code; Again heavy refactoring...