refactor and cleanup

Change-Id: Ia59c83978c26cebe060a301ec37bacd805d36ef5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a94fa65..98a55d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,12 @@
     src/security/tls_session.cpp
     src/security/certstore.cpp
     src/security/threadloop.cpp
+    src/upnp/upnp_context.cpp
+    src/upnp/upnp_control.cpp
+    src/upnp/protocol/mapping.cpp
+    src/upnp/upnp_context.cpp
+    src/upnp/upnp_control.cpp
+    src/upnp/protocol/igd.cpp   
 )
 
 list (APPEND dhtnet_HEADERS
@@ -40,10 +46,13 @@
     include/fileutils.h
     include/string_utils.h
     include/ip_utils.h
+    include/mapping.h
+    include/upnp_context.h
+    include/upnp_control.h
 )
 
 add_library(dhtnet ${dhtnet_SOURCES})
-target_link_libraries(dhtnet PUBLIC PkgConfig::opendht fmt::fmt msgpack-cxx)
+target_link_libraries(dhtnet PUBLIC PkgConfig::opendht PkgConfig::pjproject fmt::fmt msgpackc)
 target_include_directories(dhtnet PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>