Reverted changes to create event and rearranged
Merge pull request #2 from richardszeto/create_event

Reverted changes to create event and rearranged