Adjusted logic to use the new event package as the middleman that has the common model for controllers and services.