Update Pub/Sub model

[tommyah]

The publisher/subscriber model needs some updates in regards to the following:

• The event types are global meaning that testing different cases is difficult
• Using interfaces that serve as event channels reduce coupling and allows for testing