Renamed event listener class to Listener