Ideally we should make current classes deprecated.

We can move those event classes to the event package and have deprecated classes (extending those from the new event package) in the current package.