Refactor Upnp content directory service