Moved Listener to command package