add support for picking directly from router

also restructure files, add some utilities, clean up UI slightly