Servlet refactor 1: Event manager
All servlets refactored