Extracted message processing from Bus into seperate classes
Fixed merge conflicts