Removing the concept of an endpoint, it was pointless unless I was publishing information about the endpoint.

Refactoring the event mechanism, taking a lot of the load from the service bus and using the message router instead.
Renaming for convention and adding logging for event publishing.