Move EventAdapter
Refactor the strings