Refactor EventHandler dir structure