Complete refactor of AgendaController and EventController