retouched source files in x2.Events namespace