diff --git a/.gitmodules b/.gitmodules
index 168ab2e2e1cbbdd69bde360a1bec5c1525981933..eb03775c3b76c5010c8578f8c11819b075161ef6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
 [submodule "libdap"]
 	path = libdap
-	url = https://github.com/kelvinblockchain/libdap.git
+	url = https://gitlab.com/demlabs/libdap.git
 [submodule "libdap-server"]
 	path = libdap-server
 	url = https://github.com/kelvinblockchain/libdap-server.git
 [submodule "libdap-chain"]
 	path = libdap-chain
-	url = https://github.com/kelvinblockchain/libdap-chain.git
+	url = https://gitlab.com/demlabs/libdap-chain.git
 [submodule "libdap-stream"]
 	path = libdap-stream
-	url = https://github.com/kelvinblockchain/libdap-stream.git
+	url = https://gitlab.com/demlabs/libdap-stream.git
 [submodule "libdap-stream-ch-vpn"]
 	path = libdap-stream-ch-vpn
-	url = https://github.com/kelvinblockchain/libdap-stream-ch-vpn.git
+	url = https://gitlab.com/demlabs/libdap-stream-ch-vpn.git
 [submodule "libdap-stream-ch-av"]
 	path = libdap-stream-ch-av
-	url = https://github.com/kelvinblockchain/libdap-stream-ch-av
+	url = https://gitlab.com/demlabs/libdap-stream-ch-av
 [submodule "libdap-stream-ch-chat"]
 	path = libdap-stream-ch-chat
-	url = https://github.com/kelvinblockchain/libdap-stream-ch-chat
+	url = https://gitlab.com/demlabs/libdap-stream-ch-chat
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6309d3cccf61de7fbd88ca2dc18ea9a353ace2ce..cc95ae44e1132b5deb273da69ba284a1ff2c4c1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,10 @@ add_definitions ("${dap_udp_server_DEFINITIONS}")
 add_definitions ("${dap_session_DEFINITIONS}")
 add_definitions ("${dap_stream_DEFINITIONS}")
 
-set(SOURCES sources/kelvin-node.c sources/node_manager.c )
+set(SOURCES sources/main.c sources/node_manager.c )
 set(HEADERS sources/node_manager.h)
 
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
-add_executable(${PROJECT_NAME} "sources/kelvin-node.c" ${HEADERS} ${SOURCES} ${CRYPTO_SRCS})
+add_executable(${PROJECT_NAME} "sources/main.c" ${HEADERS} ${SOURCES} ${CRYPTO_SRCS})
 target_link_libraries(${PROJECT_NAME} dap_http_server dap_core_server dap_udp_server dap_session dap_crypto  dap_core dap_enc_server dap_stream  m pthread)
diff --git a/libdap b/libdap
index 10ee49ab4ba2354c4710deb94b9bb51cd4badf6b..ed18c7882c3586a2f323667c8e30d21d86cac5fd 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 10ee49ab4ba2354c4710deb94b9bb51cd4badf6b
+Subproject commit ed18c7882c3586a2f323667c8e30d21d86cac5fd
diff --git a/libdap-server b/libdap-server
index 6366bceae27b633d32630053c9fd295f07db7435..b74c398692051acb301f3dda4ffc1bb8a87c5281 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit 6366bceae27b633d32630053c9fd295f07db7435
+Subproject commit b74c398692051acb301f3dda4ffc1bb8a87c5281
diff --git a/libdap-stream b/libdap-stream
index ef24af6c87d6141ebb919a62f8b1fd461a373f60..a7f193603b176c0007a011c7cdce37180848cc80 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit ef24af6c87d6141ebb919a62f8b1fd461a373f60
+Subproject commit a7f193603b176c0007a011c7cdce37180848cc80