diff --git a/channels/reliable_channel.nim b/channels/reliable_channel.nim
index 6aa7086e5..85e2d80c3 100644
--- a/channels/reliable_channel.nim
+++ b/channels/reliable_channel.nim
@@ -21,7 +21,7 @@ import stew/byteutils
 import libp2p/crypto/crypto as libp2p_crypto
 
 import waku/api/types
-import waku/node/delivery_service/send_service
+import messaging/delivery_service/send_service
 import waku/waku_core/topics
 
 import ./events
diff --git a/channels/reliable_channel_manager.nim b/channels/reliable_channel_manager.nim
index 68ae82388..09514b1dc 100644
--- a/channels/reliable_channel_manager.nim
+++ b/channels/reliable_channel_manager.nim
@@ -13,7 +13,7 @@ import stew/byteutils
 import brokers/broker_context
 
 import waku/events/message_events as waku_message_events
-import waku/messaging_client
+import messaging/messaging_client
 import waku/waku_core/topics
 
 import ./reliable_channel
diff --git a/waku/node/delivery_service/not_delivered_storage/migrations.nim b/messaging/delivery_service/not_delivered_storage/migrations.nim
similarity index 91%
rename from waku/node/delivery_service/not_delivered_storage/migrations.nim
rename to messaging/delivery_service/not_delivered_storage/migrations.nim
index 807074d64..da6e1ef94 100644
--- a/waku/node/delivery_service/not_delivered_storage/migrations.nim
+++ b/messaging/delivery_service/not_delivered_storage/migrations.nim
@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import std/[tables, strutils, os], results, chronicles
-import ../../../common/databases/db_sqlite, ../../../common/databases/common
+import waku/common/databases/db_sqlite, waku/common/databases/common
 
 logScope:
   topics = "waku node delivery_service"
diff --git a/waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim b/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
similarity index 87%
rename from waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim
rename to messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
index b0f5f5828..d704e3e1c 100644
--- a/waku/node/delivery_service/not_delivered_storage/not_delivered_storage.nim
+++ b/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
@@ -9,9 +9,7 @@
 
 import results
 import
-  ../../../common/databases/db_sqlite,
-  ../../../waku_core/message/message,
-  ../../../node/delivery_service/not_delivered_storage/migrations
+  waku/common/databases/db_sqlite, waku/waku_core/message/message, ./migrations
 
 const NotDeliveredMessagesDbUrl = "not-delivered-messages.db"
 
diff --git a/waku/node/delivery_service/recv_service.nim b/messaging/delivery_service/recv_service.nim
similarity index 100%
rename from waku/node/delivery_service/recv_service.nim
rename to messaging/delivery_service/recv_service.nim
diff --git a/waku/node/delivery_service/recv_service/recv_service.nim b/messaging/delivery_service/recv_service/recv_service.nim
similarity index 100%
rename from waku/node/delivery_service/recv_service/recv_service.nim
rename to messaging/delivery_service/recv_service/recv_service.nim
diff --git a/waku/node/delivery_service/send_service.nim b/messaging/delivery_service/send_service.nim
similarity index 100%
rename from waku/node/delivery_service/send_service.nim
rename to messaging/delivery_service/send_service.nim
diff --git a/waku/node/delivery_service/send_service/delivery_task.nim b/messaging/delivery_service/send_service/delivery_task.nim
similarity index 100%
rename from waku/node/delivery_service/send_service/delivery_task.nim
rename to messaging/delivery_service/send_service/delivery_task.nim
diff --git a/waku/node/delivery_service/send_service/lightpush_processor.nim b/messaging/delivery_service/send_service/lightpush_processor.nim
similarity index 100%
rename from waku/node/delivery_service/send_service/lightpush_processor.nim
rename to messaging/delivery_service/send_service/lightpush_processor.nim
diff --git a/waku/node/delivery_service/send_service/relay_processor.nim b/messaging/delivery_service/send_service/relay_processor.nim
similarity index 100%
rename from waku/node/delivery_service/send_service/relay_processor.nim
rename to messaging/delivery_service/send_service/relay_processor.nim
diff --git a/waku/node/delivery_service/send_service/send_processor.nim b/messaging/delivery_service/send_service/send_processor.nim
similarity index 100%
rename from waku/node/delivery_service/send_service/send_processor.nim
rename to messaging/delivery_service/send_service/send_processor.nim
diff --git a/waku/node/delivery_service/send_service/send_service.nim b/messaging/delivery_service/send_service/send_service.nim
similarity index 100%
rename from waku/node/delivery_service/send_service/send_service.nim
rename to messaging/delivery_service/send_service/send_service.nim
diff --git a/waku/messaging_client.nim b/messaging/messaging_client.nim
similarity index 91%
rename from waku/messaging_client.nim
rename to messaging/messaging_client.nim
index 1fc4deb3c..d191f15fb 100644
--- a/waku/messaging_client.nim
+++ b/messaging/messaging_client.nim
@@ -1,14 +1,10 @@
 import results, chronos
 import chronicles
 import
-  ./api/types,
-  ./node/[
-    waku_node,
-    subscription_manager,
-    delivery_service/recv_service,
-    delivery_service/send_service,
-    delivery_service/send_service/delivery_task,
-  ]
+  waku/api/types,
+  waku/node/[waku_node, subscription_manager],
+  messaging/delivery_service/[recv_service, send_service],
+  messaging/delivery_service/send_service/delivery_task
 
 type MessagingClient* = ref object
   node: WakuNode
diff --git a/tests/api/test_api_receive.nim b/tests/api/test_api_receive.nim
index 85e522afc..600dadcfb 100644
--- a/tests/api/test_api_receive.nim
+++ b/tests/api/test_api_receive.nim
@@ -6,7 +6,8 @@ import libp2p/[peerid, peerinfo, crypto/crypto]
 import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
 import ../waku_archive/archive_utils
-import waku/messaging_client
+import messaging/messaging_client
+import messaging/delivery_service/recv_service
 
 import
   waku,
@@ -17,7 +18,6 @@ import
     waku_relay/protocol,
     waku_archive,
     waku_archive/common as archive_common,
-    node/delivery_service/recv_service,
   ]
 import waku/factory/waku_conf
 import tools/confutils/cli_args
diff --git a/tests/api/test_api_subscription.nim b/tests/api/test_api_subscription.nim
index 7cb0e981a..c9db540f1 100644
--- a/tests/api/test_api_subscription.nim
+++ b/tests/api/test_api_subscription.nim
@@ -5,7 +5,7 @@ import chronos, testutils/unittests, stew/byteutils
 import libp2p/[peerid, peerinfo, multiaddress, crypto/crypto]
 import brokers/broker_context
 import ../testlib/[common, wakucore, wakunode, testasync]
-import waku/messaging_client
+import messaging/messaging_client
 
 import
   waku,
diff --git a/tests/node/test_wakunode_health_monitor.nim b/tests/node/test_wakunode_health_monitor.nim
index be779c586..01b43e6df 100644
--- a/tests/node/test_wakunode_health_monitor.nim
+++ b/tests/node/test_wakunode_health_monitor.nim
@@ -15,7 +15,6 @@ import
     node/health_monitor/protocol_health,
     node/health_monitor/topic_health,
     node/health_monitor/node_health_monitor,
-    messaging_client,
     node/waku_node/relay,
     node/waku_node/store,
     node/waku_node/lightpush,
@@ -27,6 +26,7 @@ import
 
 import ../testlib/[wakunode, wakucore], ../waku_archive/archive_utils
 import waku/node/subscription_manager
+import messaging/messaging_client
 
 const MockDLow = 4 # Mocked GossipSub DLow value
 
diff --git a/waku/api/api.nim b/waku/api/api.nim
index 24049002b..2a2e125a7 100644
--- a/waku/api/api.nim
+++ b/waku/api/api.nim
@@ -1,9 +1,9 @@
 import chronicles, chronos, results
 
 import waku/factory/waku
-import waku/messaging_client
+import messaging/messaging_client
 import waku/[requests/health_requests, waku_core, waku_node]
-import waku/node/delivery_service/send_service
+import messaging/delivery_service/send_service
 import waku/node/subscription_manager
 import libp2p/peerid
 import ../../tools/confutils/cli_args
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index edd02ade8..510e38376 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -30,7 +30,6 @@ import
     waku_enr/sharding,
     waku_enr/multiaddr,
     api/types,
-    messaging_client,
     common/logging,
     node/peer_manager,
     node/health_monitor,
@@ -50,6 +49,7 @@ import
     persistency/persistency,
   ],
   channels/reliable_channel_manager,
+  messaging/messaging_client,
   ./waku_conf,
   ./waku_state_info