Also separate the event implementation into its own static class. Change-Id: I09e5ebf150189c97304ea2beb42d936b792053ef