diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 8cdd6eddd..ad19bf1e0 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -28,9 +28,9 @@ import
   ../../waku/v2/protocol/waku_lightpush/rpc,
   ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/protocol/waku_store,
+  ../../waku/v2/protocol/waku_dnsdisc,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/waku_metrics,
-  ../../waku/v2/node/dnsdisc/waku_dnsdisc,
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/compat,
   ../../waku/v2/utils/peers,
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index 4c7486b91..c9764990f 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -28,8 +28,6 @@ import
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/peer_manager/peer_store/waku_peer_storage,
   ../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
-  ../../waku/v2/node/dnsdisc/waku_dnsdisc,
-  ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/node/wakuswitch,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/waku_metrics,
@@ -43,6 +41,8 @@ import
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/protocol/waku_lightpush,
+  ../../waku/v2/protocol/waku_dnsdisc,
+  ../../waku/v2/protocol/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/utils/peers,
   ../../waku/v2/utils/wakuenr,
diff --git a/examples/v2/publisher.nim b/examples/v2/publisher.nim
index 58e39b5d2..45615ce5d 100644
--- a/examples/v2/publisher.nim
+++ b/examples/v2/publisher.nim
@@ -11,10 +11,10 @@ import
 
 import
   ../../../waku/common/logging,
-  ../../../waku/v2/node/discv5/waku_discv5,
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_discv5,
   ../../../waku/v2/utils/time,
   ../../../waku/v2/utils/wakuenr
 
diff --git a/examples/v2/subscriber.nim b/examples/v2/subscriber.nim
index 1e51743b7..be9804079 100644
--- a/examples/v2/subscriber.nim
+++ b/examples/v2/subscriber.nim
@@ -11,10 +11,10 @@ import
 
 import
   ../../../waku/common/logging,
-  ../../../waku/v2/node/discv5/waku_discv5,
   ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
+  ../../../waku/v2/protocol/waku_discv5,
   ../../../waku/v2/utils/wakuenr
 
 # An accesible bootstrap node. See wakuv2.prod fleets.status.im
diff --git a/tests/v2/test_waku_discv5.nim b/tests/v2/test_waku_discv5.nim
index 08bf3e731..ab30f178f 100644
--- a/tests/v2/test_waku_discv5.nim
+++ b/tests/v2/test_waku_discv5.nim
@@ -10,9 +10,9 @@ import
   eth/keys,
   eth/p2p/discoveryv5/enr
 import
-  ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/node/waku_node,
+  ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_discv5,
   ./testlib/common,
   ./testlib/waku2
 
diff --git a/tests/v2/test_waku_dnsdisc.nim b/tests/v2/test_waku_dnsdisc.nim
index 62d8f85af..b618f45b0 100644
--- a/tests/v2/test_waku_dnsdisc.nim
+++ b/tests/v2/test_waku_dnsdisc.nim
@@ -2,9 +2,9 @@
 
 import
   std/[sequtils, tables],
-  testutils/unittests,
   stew/shims/net,
   stew/[base32, results],
+  testutils/unittests,
   chronicles,
   chronos,
   libp2p/crypto/crypto,
@@ -12,8 +12,8 @@ import
   discovery/dnsdisc/builder
 import
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/node/dnsdisc/waku_dnsdisc,
   ../../waku/v2/node/waku_node,
+  ../../waku/v2/protocol/waku_dnsdisc,
   ./testlib/common,
   ./testlib/waku2
 
diff --git a/tests/v2/test_waku_peer_exchange.nim b/tests/v2/test_waku_peer_exchange.nim
index d412c55e1..baebfb9f8 100644
--- a/tests/v2/test_waku_peer_exchange.nim
+++ b/tests/v2/test_waku_peer_exchange.nim
@@ -14,7 +14,7 @@ import
 import
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/peer_manager,
-  ../../waku/v2/node/discv5/waku_discv5,
+  ../../waku/v2/protocol/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/protocol/waku_peer_exchange/rpc,
   ../../waku/v2/protocol/waku_peer_exchange/rpc_codec,
diff --git a/tools/networkmonitor/networkmonitor.nim b/tools/networkmonitor/networkmonitor.nim
index dde2992d7..6fee6f04b 100644
--- a/tools/networkmonitor/networkmonitor.nim
+++ b/tools/networkmonitor/networkmonitor.nim
@@ -5,6 +5,7 @@ else:
 
 import
   std/[tables,strutils,times,sequtils],
+  stew/shims/net,
   chronicles,
   chronicles/topics_registry,
   chronos,
@@ -15,18 +16,17 @@ import
   libp2p/crypto/crypto,
   metrics,
   metrics/chronos_httpserver,
-  presto/[route, server, client],
-  stew/shims/net
+  presto/[route, server, client]
 
 import
-  ../../waku/v2/node/discv5/waku_discv5,
   ../../apps/wakunode2/wakunode2,
-  ../../waku/v2/node/dnsdisc/waku_dnsdisc,
   ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/waku_node,
-  ../../waku/v2/utils/wakuenr,
   ../../waku/v2/protocol/waku_message,
+  ../../waku/v2/protocol/waku_discv5,
+  ../../waku/v2/protocol/waku_dnsdisc,
   ../../waku/v2/utils/peers,
+  ../../waku/v2/utils/wakuenr,
   ./networkmonitor_metrics,
   ./networkmonitor_config,
   ./networkmonitor_utils
@@ -245,7 +245,7 @@ proc initAndStartNode(conf: NetworkMonitorConf): Result[WakuNode, string] =
     node.wakuDiscv5 = WakuDiscoveryV5.new(
         some(extIp), some(nodeTcpPort), some(nodeUdpPort),
         bindIp, nodeUdpPort, discv5BootstrapEnrs, false,
-        keys.PrivateKey(nodeKey.skkey), flags, [], node.rng)
+        keys.PrivateKey(nodeKey.skkey), flags, @[], node.rng)
 
     node.wakuDiscv5.protocol.open()
     return ok(node)
diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim
index fb9771c6f..74cba8a17 100644
--- a/waku/v2/node/waku_node.nim
+++ b/waku/v2/node/waku_node.nim
@@ -35,13 +35,13 @@ import
   ../protocol/waku_filter/client as filter_client,
   ../protocol/waku_lightpush,
   ../protocol/waku_lightpush/client as lightpush_client,
+  ../protocol/waku_dnsdisc,
+  ../protocol/waku_discv5,
   ../protocol/waku_peer_exchange,
   ../utils/peers,
   ../utils/wakuenr,
   ../utils/time,
   ./peer_manager,
-  ./dnsdisc/waku_dnsdisc,
-  ./discv5/waku_discv5,
   ./wakuswitch
 
 when defined(rln):
diff --git a/waku/v2/node/discv5/waku_discv5.nim b/waku/v2/protocol/waku_discv5.nim
similarity index 99%
rename from waku/v2/node/discv5/waku_discv5.nim
rename to waku/v2/protocol/waku_discv5.nim
index 80f1b5c56..5963c5787 100644
--- a/waku/v2/node/discv5/waku_discv5.nim
+++ b/waku/v2/protocol/waku_discv5.nim
@@ -14,11 +14,12 @@ import
   eth/p2p/discoveryv5/node,
   eth/p2p/discoveryv5/protocol
 import
-  ../../utils/peers,
-  ../../utils/wakuenr
+  ../utils/peers,
+  ../utils/wakuenr
 
 export protocol, wakuenr
 
+
 declarePublicGauge waku_discv5_discovered, "number of nodes discovered"
 declarePublicGauge waku_discv5_errors, "number of waku discv5 errors", ["type"]
 
diff --git a/waku/v2/node/dnsdisc/waku_dnsdisc.nim b/waku/v2/protocol/waku_dnsdisc.nim
similarity index 98%
rename from waku/v2/node/dnsdisc/waku_dnsdisc.nim
rename to waku/v2/protocol/waku_dnsdisc.nim
index 349f0543c..9cb79df12 100644
--- a/waku/v2/node/dnsdisc/waku_dnsdisc.nim
+++ b/waku/v2/protocol/waku_dnsdisc.nim
@@ -20,8 +20,9 @@ import
   libp2p/crypto/secp,
   libp2p/multiaddress,
   libp2p/peerid,
-  discovery/dnsdisc/client,
-  ../../utils/peers
+  discovery/dnsdisc/client
+import
+  ../utils/peers
 
 export client
 
diff --git a/waku/v2/protocol/waku_peer_exchange/protocol.nim b/waku/v2/protocol/waku_peer_exchange/protocol.nim
index 1e68c23a4..42c376c7b 100644
--- a/waku/v2/protocol/waku_peer_exchange/protocol.nim
+++ b/waku/v2/protocol/waku_peer_exchange/protocol.nim
@@ -9,8 +9,8 @@ import
   eth/p2p/discoveryv5/enr
 import
   ../../node/peer_manager,
-  ../../node/discv5/waku_discv5,
   ../waku_message,
+  ../waku_discv5,
   ./rpc,
   ./rpc_codec