fixing events conventions
removing wrong files