Revert "merge agenda into event"

This reverts commit 403d01a0723f198358b758805b283371e1b101df.