o Move upnp-display out of main.