adding some more refactoring of the event system
right now it does nothing special and do not replace anything in place