outsourced EventHandler
renamed class