[WCP] Refactoring events into individual event modules