Removing unused Event source file. Tweaking some Key structs/enums.