diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 9eb6fa309..dc0fd38bc 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -15,18 +15,19 @@ import
   libp2p/[builders, multihash],
   libp2p/transports/[transport, tcptransport, wstransport]
 import
-  ../node/storage/message/waku_store_queue,
   ../protocol/[waku_relay, waku_message],
   ../protocol/waku_store,
   ../protocol/waku_swap/waku_swap,
   ../protocol/waku_filter,
   ../protocol/waku_lightpush,
   ../protocol/waku_rln_relay/[waku_rln_relay_types], 
-  ../utils/[peers, requests, wakuswitch, wakuenr],
+  ../utils/[peers, requests, wakuenr],
   ./peer_manager/peer_manager,
+  ./storage/message/waku_store_queue,
   ./storage/message/message_store,
   ./dnsdisc/waku_dnsdisc,
   ./discv5/waku_discv5,
+  ./wakuswitch,
   ./wakunode2_types
 
 export
diff --git a/waku/v2/utils/wakuswitch.nim b/waku/v2/node/wakuswitch.nim
similarity index 100%
rename from waku/v2/utils/wakuswitch.nim
rename to waku/v2/node/wakuswitch.nim