Removing extension methods

extension methods are moved back into the Event and EventDrivenBehavior
classes