added events and fixed the 'to many listener problem'
removing unneeded files