Refactor self to Events

Refactor self to Events

Issue with `registeredEvents` losing events likely because of this