Indent Event.Types and fix #16 (make substructs of Event static)