WindowRenderSurface and EventHandler refactoring