Refactor event-config and clean up dependencies
Merge branch 'working'