More renaming and file deletions
Introduced new EventManager namespace