diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 64da6d221..5ceb87fbb 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -29,7 +29,7 @@ import
   ../../waku/v2/protocol/waku_store,
   ../../waku/v2/node/[waku_node, waku_payload, waku_metrics],
   ../../waku/v2/node/dnsdisc/waku_dnsdisc,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/[peers, time],
   ../../waku/common/utils/nat,
   ./config_chat2
diff --git a/apps/wakubridge/wakubridge.nim b/apps/wakubridge/wakubridge.nim
index 148d07ba8..82b287916 100644
--- a/apps/wakubridge/wakubridge.nim
+++ b/apps/wakubridge/wakubridge.nim
@@ -28,7 +28,7 @@ import
   ../../waku/v2/utils/time,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/node/waku_node,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/jsonrpc/[debug_api,
                               filter_api,
                               relay_api,
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index 8e35776b7..01efe5983 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -25,7 +25,7 @@ import
   ../../waku/common/sqlite,
   ../../waku/common/utils/nat,
   ../../waku/common/logging,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../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,
diff --git a/examples/v2/publisher.nim b/examples/v2/publisher.nim
index 30c77848f..3708195e2 100644
--- a/examples/v2/publisher.nim
+++ b/examples/v2/publisher.nim
@@ -12,7 +12,7 @@ import
 import
   ../../../waku/common/logging,
   ../../../waku/v2/node/discv5/waku_discv5,
-  ../../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/utils/time,
diff --git a/examples/v2/subscriber.nim b/examples/v2/subscriber.nim
index 9dcf79ec4..556c1506c 100644
--- a/examples/v2/subscriber.nim
+++ b/examples/v2/subscriber.nim
@@ -12,7 +12,7 @@ import
 import
   ../../../waku/common/logging,
   ../../../waku/v2/node/discv5/waku_discv5,
-  ../../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/node/waku_node,
   ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/utils/wakuenr
diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim
index fcd78d202..9af82e656 100644
--- a/tests/v2/test_jsonrpc_waku.nim
+++ b/tests/v2/test_jsonrpc_waku.nim
@@ -14,7 +14,7 @@ import
   libp2p/protocols/pubsub/rpc/message
 import
   ../../waku/v1/node/rpc/hexstrings,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/jsonrpc/[store_api,
                               relay_api,
diff --git a/tests/v2/test_waku_dnsdisc.nim b/tests/v2/test_waku_dnsdisc.nim
index 2467b9d66..2d3a4996d 100644
--- a/tests/v2/test_waku_dnsdisc.nim
+++ b/tests/v2/test_waku_dnsdisc.nim
@@ -11,7 +11,7 @@ import
   eth/keys,
   discovery/dnsdisc/builder
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/dnsdisc/waku_dnsdisc,
   ../../waku/v2/node/waku_node,
   ../test_helpers
diff --git a/tests/v2/test_waku_filter.nim b/tests/v2/test_waku_filter.nim
index 1629b7299..035ec8443 100644
--- a/tests/v2/test_waku_filter.nim
+++ b/tests/v2/test_waku_filter.nim
@@ -7,7 +7,7 @@ import
   chronos,
   libp2p/crypto/crypto
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/protocol/waku_filter/client,
diff --git a/tests/v2/test_waku_lightpush.nim b/tests/v2/test_waku_lightpush.nim
index ef50f63d8..f0e138847 100644
--- a/tests/v2/test_waku_lightpush.nim
+++ b/tests/v2/test_waku_lightpush.nim
@@ -6,7 +6,7 @@ import
   chronos, 
   libp2p/crypto/crypto
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_lightpush,
   ../../waku/v2/protocol/waku_lightpush/client,
diff --git a/tests/v2/test_waku_peer_exchange.nim b/tests/v2/test_waku_peer_exchange.nim
index d32ccb60a..eb851f79b 100644
--- a/tests/v2/test_waku_peer_exchange.nim
+++ b/tests/v2/test_waku_peer_exchange.nim
@@ -12,7 +12,7 @@ import
   eth/p2p/discoveryv5/enr
 import
   ../../waku/v2/node/waku_node,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/discv5/waku_discv5,
   ../../waku/v2/protocol/waku_peer_exchange,
   ../../waku/v2/protocol/waku_peer_exchange/rpc,
diff --git a/tests/v2/test_wakunode.nim b/tests/v2/test_wakunode.nim
index 4e8a207a3..2b59445a2 100644
--- a/tests/v2/test_wakunode.nim
+++ b/tests/v2/test_wakunode.nim
@@ -16,7 +16,7 @@ import
   libp2p/nameresolving/mockresolver
 import
   ../../waku/v2/node/waku_node,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_relay,
   ../../waku/v2/utils/peers
diff --git a/tests/v2/test_wakunode_filter.nim b/tests/v2/test_wakunode_filter.nim
index 2576e75a6..1e016d491 100644
--- a/tests/v2/test_wakunode_filter.nim
+++ b/tests/v2/test_wakunode_filter.nim
@@ -7,7 +7,7 @@ import
   chronos, 
   libp2p/crypto/crypto
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/utils/peers,
diff --git a/tests/v2/test_wakunode_lightpush.nim b/tests/v2/test_wakunode_lightpush.nim
index 9cf91d51d..0283b6b45 100644
--- a/tests/v2/test_wakunode_lightpush.nim
+++ b/tests/v2/test_wakunode_lightpush.nim
@@ -10,7 +10,7 @@ import
 import
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_lightpush,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/node/waku_node,
   ./testlib/common
diff --git a/tests/v2/test_wakunode_relay.nim b/tests/v2/test_wakunode_relay.nim
index 3eb30ac27..1db98e389 100644
--- a/tests/v2/test_wakunode_relay.nim
+++ b/tests/v2/test_wakunode_relay.nim
@@ -17,7 +17,7 @@ import
   libp2p/protocols/pubsub/gossipsub
 import
   ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/node/waku_node
 
diff --git a/tests/v2/waku_archive/test_waku_archive.nim b/tests/v2/waku_archive/test_waku_archive.nim
index 5a76d0f72..bff32d961 100644
--- a/tests/v2/waku_archive/test_waku_archive.nim
+++ b/tests/v2/waku_archive/test_waku_archive.nim
@@ -7,7 +7,6 @@ import
   libp2p/crypto/crypto
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/node/peer_manager/peer_manager,
   ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
   ../../../waku/v2/protocol/waku_archive,
diff --git a/tests/v2/waku_store/test_resume.nim b/tests/v2/waku_store/test_resume.nim
index 41efc7f63..92daf3178 100644
--- a/tests/v2/waku_store/test_resume.nim
+++ b/tests/v2/waku_store/test_resume.nim
@@ -9,7 +9,7 @@ import
 import
   ../../waku/common/sqlite,
   ../../waku/v2/node/message_store/sqlite_store,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/protocol/waku_message,
   ../../waku/v2/protocol/waku_store,
   ./testlib/common,
diff --git a/tests/v2/waku_store/test_waku_store.nim b/tests/v2/waku_store/test_waku_store.nim
index e7730d7a0..4085fbda9 100644
--- a/tests/v2/waku_store/test_waku_store.nim
+++ b/tests/v2/waku_store/test_waku_store.nim
@@ -7,7 +7,7 @@ import
   chronicles,
   libp2p/crypto/crypto
 import
-  ../../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/protocol/waku_store,
   ../../../waku/v2/protocol/waku_store/client,
diff --git a/tests/v2/waku_store/test_wakunode_store.nim b/tests/v2/waku_store/test_wakunode_store.nim
index 3606ef54a..572d5dd14 100644
--- a/tests/v2/waku_store/test_wakunode_store.nim
+++ b/tests/v2/waku_store/test_wakunode_store.nim
@@ -14,7 +14,7 @@ import
   libp2p/protocols/pubsub/gossipsub
 import
   ../../../waku/common/sqlite,
-  ../../../waku/v2/node/peer_manager/peer_manager,
+  ../../../waku/v2/node/peer_manager,
   ../../../waku/v2/protocol/waku_message,
   ../../../waku/v2/protocol/waku_archive,
   ../../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
diff --git a/tools/networkmonitor/networkmonitor.nim b/tools/networkmonitor/networkmonitor.nim
index bbfe274c3..dde2992d7 100644
--- a/tools/networkmonitor/networkmonitor.nim
+++ b/tools/networkmonitor/networkmonitor.nim
@@ -22,7 +22,7 @@ import
   ../../waku/v2/node/discv5/waku_discv5,
   ../../apps/wakunode2/wakunode2,
   ../../waku/v2/node/dnsdisc/waku_dnsdisc,
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/utils/wakuenr,
   ../../waku/v2/protocol/waku_message,
diff --git a/tools/wakucanary/wakucanary.nim b/tools/wakucanary/wakucanary.nim
index 9f3ad5f09..3de2c2e0a 100644
--- a/tools/wakucanary/wakucanary.nim
+++ b/tools/wakucanary/wakucanary.nim
@@ -10,7 +10,7 @@ import
   libp2p/nameresolving/nameresolver,
   libp2p/nameresolving/dnsresolver
 import
-  ../../waku/v2/node/peer_manager/peer_manager,
+  ../../waku/v2/node/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/node/waku_node,
   ../../waku/v2/node/waku_payload,
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index 5ed42ecbd..a387209df 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -13,7 +13,7 @@ import
   ../../protocol/waku_filter,
   ../../protocol/waku_relay,
   ../../protocol/waku_swap/waku_swap,
-  ../peer_manager/peer_manager,
+  ../peer_manager,
   ../waku_node,
   ./jsonrpc_types
 
diff --git a/waku/v2/node/jsonrpc/store_api.nim b/waku/v2/node/jsonrpc/store_api.nim
index cb027c8e4..d95f40951 100644
--- a/waku/v2/node/jsonrpc/store_api.nim
+++ b/waku/v2/node/jsonrpc/store_api.nim
@@ -12,7 +12,7 @@ import
   ../../protocol/waku_store/rpc,
   ../../utils/time,
   ../waku_node,
-  ../peer_manager/peer_manager,
+  ../peer_manager,
   ./jsonrpc_types,
   ./jsonrpc_utils
 
diff --git a/waku/v2/node/peer_manager.nim b/waku/v2/node/peer_manager.nim
new file mode 100644
index 000000000..16d0be283
--- /dev/null
+++ b/waku/v2/node/peer_manager.nim
@@ -0,0 +1,5 @@
+import
+  ./peer_manager/peer_manager
+
+export
+  peer_manager
diff --git a/waku/v2/node/waku_metrics.nim b/waku/v2/node/waku_metrics.nim
index 0773e1d0b..3f1485a22 100644
--- a/waku/v2/node/waku_metrics.nim
+++ b/waku/v2/node/waku_metrics.nim
@@ -12,7 +12,7 @@ import
 import
   ../protocol/waku_filter/protocol_metrics as filter_metrics,
   ../utils/collector,
-  ./peer_manager/peer_manager,
+  ./peer_manager,
   ./waku_node
 
 when defined(rln):
diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim
index 0e91cac7c..db11918d7 100644
--- a/waku/v2/node/waku_node.nim
+++ b/waku/v2/node/waku_node.nim
@@ -39,7 +39,7 @@ import
   ../utils/peers,
   ../utils/wakuenr,
   ../utils/time,
-  ./peer_manager/peer_manager,
+  ./peer_manager,
   ./dnsdisc/waku_dnsdisc,
   ./discv5/waku_discv5,
   ./wakuswitch
diff --git a/waku/v2/protocol/waku_filter/client.nim b/waku/v2/protocol/waku_filter/client.nim
index 9e8b63733..41f443737 100644
--- a/waku/v2/protocol/waku_filter/client.nim
+++ b/waku/v2/protocol/waku_filter/client.nim
@@ -13,7 +13,7 @@ import
   libp2p/protocols/protocol as libp2p_protocol
 import
   ../waku_message,
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../../utils/requests,
   ./rpc,
   ./rpc_codec,
diff --git a/waku/v2/protocol/waku_filter/protocol.nim b/waku/v2/protocol/waku_filter/protocol.nim
index d062b7076..05428f7df 100644
--- a/waku/v2/protocol/waku_filter/protocol.nim
+++ b/waku/v2/protocol/waku_filter/protocol.nim
@@ -9,7 +9,7 @@ import
   libp2p/crypto/crypto
 import
   ../waku_message,
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ./rpc,
   ./rpc_codec,
   ./protocol_metrics
diff --git a/waku/v2/protocol/waku_lightpush/client.nim b/waku/v2/protocol/waku_lightpush/client.nim
index db66e9d97..115ff8dca 100644
--- a/waku/v2/protocol/waku_lightpush/client.nim
+++ b/waku/v2/protocol/waku_lightpush/client.nim
@@ -11,7 +11,7 @@ import
   metrics,
   bearssl/rand
 import
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../../utils/requests,
   ../waku_message,
   ./protocol,
diff --git a/waku/v2/protocol/waku_lightpush/protocol.nim b/waku/v2/protocol/waku_lightpush/protocol.nim
index 0379b8729..c62e50109 100644
--- a/waku/v2/protocol/waku_lightpush/protocol.nim
+++ b/waku/v2/protocol/waku_lightpush/protocol.nim
@@ -11,7 +11,7 @@ import
   metrics,
   bearssl/rand
 import
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../waku_message,
   ./rpc,
   ./rpc_codec,
diff --git a/waku/v2/protocol/waku_peer_exchange/protocol.nim b/waku/v2/protocol/waku_peer_exchange/protocol.nim
index ff33f1ffe..4c1f590c7 100644
--- a/waku/v2/protocol/waku_peer_exchange/protocol.nim
+++ b/waku/v2/protocol/waku_peer_exchange/protocol.nim
@@ -8,7 +8,7 @@ import
   libp2p/crypto/crypto,
   eth/p2p/discoveryv5/enr
 import
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../../node/discv5/waku_discv5,
   ../waku_message,
   ../waku_relay,
diff --git a/waku/v2/protocol/waku_store/client.nim b/waku/v2/protocol/waku_store/client.nim
index f3a9cdf78..929e0b5f1 100644
--- a/waku/v2/protocol/waku_store/client.nim
+++ b/waku/v2/protocol/waku_store/client.nim
@@ -11,7 +11,7 @@ import
   metrics,
   bearssl/rand
 import
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../../utils/requests,
   ../../utils/time,
   ../waku_message,
diff --git a/waku/v2/protocol/waku_store/protocol.nim b/waku/v2/protocol/waku_store/protocol.nim
index 595afec0f..1223e9317 100644
--- a/waku/v2/protocol/waku_store/protocol.nim
+++ b/waku/v2/protocol/waku_store/protocol.nim
@@ -18,7 +18,7 @@ import
   libp2p/stream/connection,
   metrics
 import
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ../../utils/time,
   ../waku_message,
   ./common,
diff --git a/waku/v2/protocol/waku_swap/waku_swap.nim b/waku/v2/protocol/waku_swap/waku_swap.nim
index ccb763608..63b28bf2c 100644
--- a/waku/v2/protocol/waku_swap/waku_swap.nim
+++ b/waku/v2/protocol/waku_swap/waku_swap.nim
@@ -43,7 +43,7 @@ import
   libp2p/protocols/protocol,
   libp2p/protobuf/minprotobuf,
   libp2p/stream/connection,
-  ../../node/peer_manager/peer_manager,
+  ../../node/peer_manager,
   ./waku_swap_types,
   ../../../common/protobuf,
   ../../waku/v2/protocol/waku_swap/waku_swap_contracts
diff --git a/waku/v2/protocol/waku_swap/waku_swap_types.nim b/waku/v2/protocol/waku_swap/waku_swap_types.nim
index aa993321d..2adebf0de 100644
--- a/waku/v2/protocol/waku_swap/waku_swap_types.nim
+++ b/waku/v2/protocol/waku_swap/waku_swap_types.nim
@@ -7,7 +7,7 @@ import
   std/tables,
   bearssl/rand,
   libp2p/protocols/protocol,
-  ../../node/peer_manager/peer_manager
+  ../../node/peer_manager
 
 const
   MaxChequeSize* = 64*1024 # Used for read buffers. 64kB should be more than enough for swap cheque