Move events definitions into proper components
Merge pull request #1352 from stloyd/feature/cleanup_events

Move events definitions into proper components