changed the registerEventListener methods to use the new method
Migrated much things to the new system and marked some stuff as
Deprecated