Initial Restructure. Player Info seperated from UPNP Stuff.