Added header files to respective sources
Key events reworked