Correcting file and clas names. Implementing event handling.