Made register_listener decorator an instance method on Dispatch to get
rid of import magic in listerners
Removed old import of removed file `movement`