move event declarations to different files
remove duplicate static const