simplify event_type name and merge small file into __init__ file directly