diff --git a/.gitmodules b/.gitmodules
index eb03775c3b76c5010c8578f8c11819b075161ef6..1e5186541d45c7d559627708ce7f708debd036c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,32 @@
 [submodule "libdap"]
 	path = libdap
-	url = https://gitlab.com/demlabs/libdap.git
+	url = https://github.com/kelvinblockchain/libdap.git
+	branch = master
 [submodule "libdap-server"]
 	path = libdap-server
 	url = https://github.com/kelvinblockchain/libdap-server.git
+	branch = master
 [submodule "libdap-chain"]
 	path = libdap-chain
-	url = https://gitlab.com/demlabs/libdap-chain.git
+	url = https://github.com/kelvinblockchain/libdap-chain.git
+	branch = master
 [submodule "libdap-stream"]
 	path = libdap-stream
-	url = https://gitlab.com/demlabs/libdap-stream.git
+	url = https://github.com/kelvinblockchain/libdap-stream.git
+	branch = master
 [submodule "libdap-stream-ch-vpn"]
 	path = libdap-stream-ch-vpn
-	url = https://gitlab.com/demlabs/libdap-stream-ch-vpn.git
+	url = https://github.com/kelvinblockchain/libdap-stream-ch-vpn.git
+	branch = master
 [submodule "libdap-stream-ch-av"]
 	path = libdap-stream-ch-av
-	url = https://gitlab.com/demlabs/libdap-stream-ch-av
+	url = https://github.com/kelvinblockchain/libdap-stream-ch-av
+	branch = master
 [submodule "libdap-stream-ch-chat"]
 	path = libdap-stream-ch-chat
-	url = https://gitlab.com/demlabs/libdap-stream-ch-chat
+	url = https://github.com/kelvinblockchain/libdap-stream-ch-chat
+	branch = master
+[submodule "libdap-server-core"]
+	path = libdap-server-core
+	url = https://github.com/kelvinblockchain/libdap-server-core
+	branch = master
diff --git a/libdap b/libdap
index ed18c7882c3586a2f323667c8e30d21d86cac5fd..970c94e2597d485bfa0355a33bcb0101eb872874 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit ed18c7882c3586a2f323667c8e30d21d86cac5fd
+Subproject commit 970c94e2597d485bfa0355a33bcb0101eb872874
diff --git a/libdap-chain b/libdap-chain
index 55cb80fe28af857a0e515f143b2b706ef92297ee..4530b8182a18d29b2befb88ca3c7a323cbc36eb6 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 55cb80fe28af857a0e515f143b2b706ef92297ee
+Subproject commit 4530b8182a18d29b2befb88ca3c7a323cbc36eb6
diff --git a/libdap-server-core b/libdap-server-core
new file mode 160000
index 0000000000000000000000000000000000000000..de8f82d6f484bf4f9d27f82a6c0216e8760be0c8
--- /dev/null
+++ b/libdap-server-core
@@ -0,0 +1 @@
+Subproject commit de8f82d6f484bf4f9d27f82a6c0216e8760be0c8
diff --git a/libdap-stream-ch-vpn b/libdap-stream-ch-vpn
index c864bcf8a5bfa89ee85237ee9809fdff1adef008..da778f80105ed3680cd5edf912e0ff59584de5dd 160000
--- a/libdap-stream-ch-vpn
+++ b/libdap-stream-ch-vpn
@@ -1 +1 @@
-Subproject commit c864bcf8a5bfa89ee85237ee9809fdff1adef008
+Subproject commit da778f80105ed3680cd5edf912e0ff59584de5dd
diff --git a/sources/kelvin-node.c b/sources/main.c
similarity index 100%
rename from sources/kelvin-node.c
rename to sources/main.c