Issue #10: Initial work on MVC architecture-pattern like coding - move listeners to controller and assigne event handling correctly.