Move url-handler to top level
Additional fix to previous commit
Merge pull request #275 from GoogleChrome/move-url-handler-to-top-level

Move url-handler to top level