Fixed redundant files, added events