Moved listenner to a dedicated class
Made controller as a service