Cleaned up organization of code
Merge pull request #20 from richardszeto/create_event

Cleaned up organization of code