Move EventServer to common