diff --git a/library/logos_delivery_api/node_api.nim b/library/logos_delivery_api/node_api.nim
index bed900683..d70c34252 100644
--- a/library/logos_delivery_api/node_api.nim
+++ b/library/logos_delivery_api/node_api.nim
@@ -7,7 +7,7 @@ import
   logos_delivery/api/types,
   logos_delivery/waku/api/events/health_events,
   logos_delivery/waku/api/events/peer_events,
-  logos_delivery/api/logos_delivery_conf_json,
+  logos_delivery/api/conf/logos_delivery_conf_json,
   ../declare_lib,
   ../json_event
 
diff --git a/logos_delivery/api/kernel_conf.nim b/logos_delivery/api/conf/kernel_conf.nim
similarity index 100%
rename from logos_delivery/api/kernel_conf.nim
rename to logos_delivery/api/conf/kernel_conf.nim
diff --git a/logos_delivery/api/logos_delivery_conf.nim b/logos_delivery/api/conf/logos_delivery_conf.nim
similarity index 96%
rename from logos_delivery/api/logos_delivery_conf.nim
rename to logos_delivery/api/conf/logos_delivery_conf.nim
index 66acaa8fc..ae069b2df 100644
--- a/logos_delivery/api/logos_delivery_conf.nim
+++ b/logos_delivery/api/conf/logos_delivery_conf.nim
@@ -3,7 +3,7 @@
 import std/options
 import results
 
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 import logos_delivery/channels/reliable_channel_manager
 
 export options, messaging_conf, reliable_channel_manager
diff --git a/logos_delivery/api/logos_delivery_conf_json.nim b/logos_delivery/api/conf/logos_delivery_conf_json.nim
similarity index 99%
rename from logos_delivery/api/logos_delivery_conf_json.nim
rename to logos_delivery/api/conf/logos_delivery_conf_json.nim
index 260f4f2ae..e5df174e4 100644
--- a/logos_delivery/api/logos_delivery_conf_json.nim
+++ b/logos_delivery/api/conf/logos_delivery_conf_json.nim
@@ -4,7 +4,7 @@ import std/[json, options, strutils, tables]
 import results
 
 import tools/confutils/conf_from_json
-import logos_delivery/api/logos_delivery_conf
+import logos_delivery/api/conf/logos_delivery_conf
 
 const
   # Lowercased, since `collectJsonFields` keys the object case-insensitively.
diff --git a/logos_delivery/api/messaging_conf.nim b/logos_delivery/api/conf/messaging_conf.nim
similarity index 98%
rename from logos_delivery/api/messaging_conf.nim
rename to logos_delivery/api/conf/messaging_conf.nim
index da0d7c641..bf6a81695 100644
--- a/logos_delivery/api/messaging_conf.nim
+++ b/logos_delivery/api/conf/messaging_conf.nim
@@ -2,7 +2,7 @@ import std/options
 import std/net
 import results
 
-import logos_delivery/api/kernel_conf
+import logos_delivery/api/conf/kernel_conf
 import logos_delivery/messaging/messaging_client
 import logos_delivery/waku/factory/networks_config
 
diff --git a/logos_delivery/logos_delivery.nim b/logos_delivery/logos_delivery.nim
index 9ce568740..0e1f77104 100644
--- a/logos_delivery/logos_delivery.nim
+++ b/logos_delivery/logos_delivery.nim
@@ -42,7 +42,7 @@ import logos_delivery/messaging/api/[subscription, send]
 export subscription, send
 import logos_delivery/api/events/messaging_client_events
 export messaging_client_events
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 export messaging_conf
 
 # Reliable Channel layer
@@ -61,7 +61,7 @@ import logos_delivery/waku/factory/waku_conf
 import logos_delivery/waku/factory/app_callbacks
 import tools/confutils/cli_args
 import logos_delivery/waku/node/health_monitor/online_monitor
-import logos_delivery/api/logos_delivery_conf
+import logos_delivery/api/conf/logos_delivery_conf
 export logos_delivery_conf
 
 logScope:
diff --git a/logos_delivery/messaging/messaging_client.nim b/logos_delivery/messaging/messaging_client.nim
index ef69c2d43..acb5dcd35 100644
--- a/logos_delivery/messaging/messaging_client.nim
+++ b/logos_delivery/messaging/messaging_client.nim
@@ -6,7 +6,7 @@ import results, chronos
 import confutils/defs
 import libp2p/crypto/crypto
 import logos_delivery/waku/common/logging
-import logos_delivery/api/kernel_conf
+import logos_delivery/api/conf/kernel_conf
 import chronicles
 import
   logos_delivery/api/messaging_client_api,
diff --git a/tests/api/test_api_receive.nim b/tests/api/test_api_receive.nim
index 744cc5e52..870f85860 100644
--- a/tests/api/test_api_receive.nim
+++ b/tests/api/test_api_receive.nim
@@ -21,7 +21,7 @@ import
   ]
 import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 
 const TestTimeout = chronos.seconds(60)
 
diff --git a/tests/api/test_api_send.nim b/tests/api/test_api_send.nim
index e913d76a0..8df564b0d 100644
--- a/tests/api/test_api_send.nim
+++ b/tests/api/test_api_send.nim
@@ -8,7 +8,7 @@ import ../waku_archive/archive_utils
 import logos_delivery, logos_delivery/waku/[waku_node, waku_core, waku_relay/protocol]
 import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 
 type SendEventOutcome {.pure.} = enum
   Sent
diff --git a/tests/api/test_api_subscription.nim b/tests/api/test_api_subscription.nim
index 7ba3b2bf5..90d160bc3 100644
--- a/tests/api/test_api_subscription.nim
+++ b/tests/api/test_api_subscription.nim
@@ -18,7 +18,7 @@ import
   ]
 import logos_delivery/waku/factory/waku_conf
 import tools/confutils/cli_args
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 
 const TestTimeout = chronos.seconds(10)
 const NegativeTestTimeout = chronos.seconds(2)
diff --git a/tests/api/test_conf.nim b/tests/api/test_conf.nim
index 280068516..705c00825 100644
--- a/tests/api/test_conf.nim
+++ b/tests/api/test_conf.nim
@@ -3,7 +3,7 @@
 import std/[options, net], results, chronos, testutils/unittests
 import brokers/broker_context
 import logos_delivery
-import logos_delivery/api/logos_delivery_conf_json
+import logos_delivery/api/conf/logos_delivery_conf_json
 import logos_delivery/waku/factory/[waku_conf, networks_config]
 import logos_delivery/waku/common/logging
 
diff --git a/tests/channels/test_reliable_channel_send_receive.nim b/tests/channels/test_reliable_channel_send_receive.nim
index 0a7ad8e20..b76851006 100644
--- a/tests/channels/test_reliable_channel_send_receive.nim
+++ b/tests/channels/test_reliable_channel_send_receive.nim
@@ -13,7 +13,7 @@ import logos_delivery/waku/factory/waku_conf
 import logos_delivery/api/events/messaging_client_events as waku_message_events
 import logos_delivery/api/messaging_client_api
 import tools/confutils/cli_args
-import logos_delivery/api/messaging_conf
+import logos_delivery/api/conf/messaging_conf
 
 import logos_delivery/channels/reliable_channel_manager
 import logos_delivery/channels/encryption/noop_encryption