Re-organized UPnP sub-project. Now UPnP artifacts can be built from UPnP directory (and samples directory too)