Event class declarations moved into single file