diff --git a/.github/ISSUE_TEMPLATE/bump_dependencies.md b/.github/ISSUE_TEMPLATE/bump_dependencies.md
index 59f46f08b..56f95eb00 100644
--- a/.github/ISSUE_TEMPLATE/bump_dependencies.md
+++ b/.github/ISSUE_TEMPLATE/bump_dependencies.md
@@ -11,8 +11,8 @@ assignees: ''
 
 ### Bumped items
 - [ ] Update nimble dependencies
-  1. Edit manually waku.nimble. For some dependencies, we want to bump versions manually and use a pinned version, f.e., nim-libp2p and all its dependencies.
-  2. Run `nimble lock` (make sure `nimble --version` shows the Nimble version pinned in waku.nimble)
+  1. Edit manually logos_delivery.nimble. For some dependencies, we want to bump versions manually and use a pinned version, f.e., nim-libp2p and all its dependencies.
+  2. Run `nimble lock` (make sure `nimble --version` shows the Nimble version pinned in logos_delivery.nimble)
   3. Run `./tools/gen-nix-deps.sh nimble.lock nix/deps.nix` to update nix deps
 
 - [ ] Update vendor/zerokit dependency.
diff --git a/.github/ISSUE_TEMPLATE/prepare_release.md b/.github/ISSUE_TEMPLATE/prepare_release.md
index 3c2e2f729..095e54257 100644
--- a/.github/ISSUE_TEMPLATE/prepare_release.md
+++ b/.github/ISSUE_TEMPLATE/prepare_release.md
@@ -18,7 +18,7 @@ For detailed info on the release process refer to https://github.com/logos-messa
 All items below are to be completed by the owner of the given release.
 
 - [ ] Create release branch with major and minor only ( e.g. release/v0.X ) if it doesn't exist.
-- [ ] Update the `version` field in `waku.nimble` to match the release version (e.g. `version = "0.X.0"`) **and merge it before assigning any tag** - the `release-assets` workflow gates artifact build/upload.
+- [ ] Update the `version` field in `logos_delivery.nimble` to match the release version (e.g. `version = "0.X.0"`) **and merge it before assigning any tag** - the `release-assets` workflow gates artifact build/upload.
 - [ ] Assign release candidate tag to the release branch HEAD (e.g. `v0.X.0-rc.0`, `v0.X.0-rc.1`, ... `v0.X.0-rc.N`).
 - [ ] Generate and edit release notes in CHANGELOG.md.
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67a29fa31..e9f5bc072 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
           common:
           - '.github/workflows/**'
           - 'nimble.lock'
-          - 'waku.nimble'
+          - 'logos_delivery.nimble'
           - 'Makefile'
           - 'scripts/**'
           - 'flake.nix'
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
index b2066438b..4b0e7dcd2 100644
--- a/.github/workflows/container-image.yml
+++ b/.github/workflows/container-image.yml
@@ -15,7 +15,7 @@ env:
   NPROC: 2
   MAKEFLAGS: "-j${NPROC}"
   NIMFLAGS: "--parallelBuild:${NPROC}"
-  # waku.nimble reads compile flags from NIM_PARAMS, not NIMFLAGS. Without
+  # logos_delivery.nimble reads compile flags from NIM_PARAMS, not NIMFLAGS. Without
   # -d:disableMarchNative here, config.nims applies -march=native and
   # secp256k1 fails to compile.
   NIM_PARAMS: "-d:disableMarchNative"
diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml
index 77862d11b..fb631c975 100644
--- a/.github/workflows/release-assets.yml
+++ b/.github/workflows/release-assets.yml
@@ -11,7 +11,7 @@ env:
   NPROC: 2
 
 jobs:
-  # Release gate: the pushed tag MUST exactly match waku.nimble's version,
+  # Release gate: the pushed tag MUST exactly match logos_delivery.nimble's version,
   # so every published artifact reports the correct getNodeInfo Version.
   # CI cannot reject/remove a tag, so we gate artifact build & upload on
   # this instead: a mismatched tag yields no released artifacts.
@@ -19,24 +19,24 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Assert pushed tag equals waku.nimble version
+      - name: Assert pushed tag equals logos_delivery.nimble version
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           set -euo pipefail
-          NIMBLE_VERSION=$(grep -m1 '^version = ' waku.nimble | sed -E 's/version = "([^"]+)"/\1/')
+          NIMBLE_VERSION=$(grep -m1 '^version = ' logos_delivery.nimble | sed -E 's/version = "([^"]+)"/\1/')
           # Strip leading v and any prerelease suffix (e.g. v0.38.0-rc.1 ->
           # 0.38.0) so release-candidate tags build against the same
-          # waku.nimble version as the final tag.
+          # logos_delivery.nimble version as the final tag.
           TAG_VERSION="${GITHUB_REF_NAME#v}"
           BASE_VERSION="${TAG_VERSION%%-*}"
           echo "tag:                 ${GITHUB_REF_NAME} (base ${BASE_VERSION})"
-          echo "waku.nimble version: ${NIMBLE_VERSION}"
+          echo "logos_delivery.nimble version: ${NIMBLE_VERSION}"
           if [ "${BASE_VERSION}" != "${NIMBLE_VERSION}" ]; then
             echo "::error::Tag ${GITHUB_REF_NAME} (base ${BASE_VERSION}) does not match"
-            echo "::error::waku.nimble version (${NIMBLE_VERSION}). Bump waku.nimble before tagging."
+            echo "::error::logos_delivery.nimble version (${NIMBLE_VERSION}). Bump logos_delivery.nimble before tagging."
             exit 1
           fi
-          echo "OK: tag base matches waku.nimble."
+          echo "OK: tag base matches logos_delivery.nimble."
 
   build-and-upload:
     needs: verify-version
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
index ee01a9f1a..d412ae138 100644
--- a/.github/workflows/version-check.yml
+++ b/.github/workflows/version-check.yml
@@ -7,12 +7,12 @@ on:
     branches: [master]
 
 jobs:
-  # PR check: waku.nimble version must be >= the nearest tag reachable from
+  # PR check: logos_delivery.nimble version must be >= the nearest tag reachable from
   # this branch (`git describe --tags --abbrev=0`, i.e. ancestor-aware).
   # Because we check out the PR HEAD (not the simulated merge ref), a branch
   # that predates a release tag does not see that tag in its history, so a
   # newly pushed tag does NOT break in-flight PRs. Once the branch merges/
-  # rebases past the tag, the bump is then enforced. This keeps waku.nimble
+  # rebases past the tag, the bump is then enforced. This keeps logos_delivery.nimble
   # fixed as early as possible, independent of whether a release is cut.
   # The exact tag==nimble guarantee at release time lives in
   # release-assets.yml, which gates artifact publishing on it.
@@ -23,10 +23,10 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Compare waku.nimble version with nearest ancestor tag
+      - name: Compare logos_delivery.nimble version with nearest ancestor tag
         run: |
           set -euo pipefail
-          NIMBLE_VERSION=$(grep -m1 '^version = ' waku.nimble | sed -E 's/version = "([^"]+)"/\1/')
+          NIMBLE_VERSION=$(grep -m1 '^version = ' logos_delivery.nimble | sed -E 's/version = "([^"]+)"/\1/')
           # Nearest tag reachable from HEAD; --abbrev=0 drops the -<n>-g<sha>
           # suffix so we get the bare tag (e.g. v0.38.0). `--match 'v*'` skips
           # the moving `nightly` tag (auto-updated by the daily CI to point at
@@ -36,7 +36,7 @@ jobs:
           BASE_TAG=${BASE_TAG#v}
           # Compare on the base version, ignoring any -rc.N prerelease suffix.
           BASE_TAG=${BASE_TAG%%-*}
-          echo "waku.nimble version: ${NIMBLE_VERSION}"
+          echo "logos_delivery.nimble version: ${NIMBLE_VERSION}"
           echo "ancestor git tag:    ${BASE_TAG:-<none>}"
           if [ -z "${BASE_TAG}" ]; then
             echo "No ancestor release tag; skipping."
@@ -45,8 +45,8 @@ jobs:
           # lowest of the two by version sort must be the tag => nimble >= tag
           LOWEST=$(printf '%s\n%s\n' "${NIMBLE_VERSION}" "${BASE_TAG}" | sort -V | head -1)
           if [ "${LOWEST}" != "${BASE_TAG}" ] && [ "${NIMBLE_VERSION}" != "${BASE_TAG}" ]; then
-            echo "::error::waku.nimble version (${NIMBLE_VERSION}) is behind its"
-            echo "::error::ancestor git tag (v${BASE_TAG}). Bump 'version' in waku.nimble."
+            echo "::error::logos_delivery.nimble version (${NIMBLE_VERSION}) is behind its"
+            echo "::error::ancestor git tag (v${BASE_TAG}). Bump 'version' in logos_delivery.nimble."
             exit 1
           fi
-          echo "OK: waku.nimble is not behind its ancestor tag."
+          echo "OK: logos_delivery.nimble is not behind its ancestor tag."
diff --git a/.gitignore b/.gitignore
index 0f9751f9b..bfd8f269f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /tags
 
 # a symlink that can't be added to the repo because of Windows
+/logos_delivery.nims
 /waku.nims
 
 # Ignore dynamic, static libs and libtool archive files
diff --git a/AGENTS.md b/AGENTS.md
index ff7d29a39..6deaa4055 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -78,7 +78,7 @@ type WakuFilter* = ref object of LPProtocol
 ## Development Essentials
 
 ### Build Requirements
-- Nim 2.x (check `waku.nimble` for minimum version)
+- Nim 2.x (check `logos_delivery.nimble` for minimum version)
 - Rust toolchain (required for RLN dependencies)
 - Build system: Make driven by Nimble (dependencies pinned in `nimble.lock`)
 
@@ -94,7 +94,7 @@ make wakunode2
 make wakunode2 NIMFLAGS="-d:chronicles_log_level=DEBUG"
 ```
 
-Note: The build uses `--mm:refc` memory management (passed automatically by the Nimble tasks in `waku.nimble`). Only relevant if compiling outside the standard build system.
+Note: The build uses `--mm:refc` memory management (passed automatically by the Nimble tasks in `logos_delivery.nimble`). Only relevant if compiling outside the standard build system.
 
 ### Common Make Targets
 ```bash
@@ -476,7 +476,7 @@ nim c -r \
 
 ### Memory Management
 - Uses `refc` (reference counting with cycle collection)
-- Automatically enforced by the build system (hardcoded in `waku.nimble`)
+- Automatically enforced by the build system (hardcoded in `logos_delivery.nimble`)
 - Do not override unless absolutely necessary, as it breaks compatibility
 
 ### RLN Dependencies
@@ -489,7 +489,7 @@ Language: Nim 2.x | License: MIT or Apache 2.0
 
 ### Important Files
 - `Makefile` - Primary build interface
-- `waku.nimble` - Package definition and build tasks (invoked by the Makefile via Nimble)
+- `logos_delivery.nimble` - Package definition and build tasks (invoked by the Makefile via Nimble)
 - `nimble.lock` - Pinned dependency versions resolved into `nimbledeps/`
 - `waku/node/waku_node.nim` - Core node implementation
 - `apps/wakunode2/wakunode2.nim` - Main CLI application
@@ -511,7 +511,7 @@ Language: Nim 2.x | License: MIT or Apache 2.0
 - `presto` - REST server
 - `nimcrypto` - Cryptographic primitives
 
-Note: For specific version requirements, check `waku.nimble`.
+Note: For specific version requirements, check `logos_delivery.nimble`.
 
 <!-- gitnexus:start -->
 # GitNexus — Code Intelligence
diff --git a/Makefile b/Makefile
index 344743c86..97819f131 100644
--- a/Makefile
+++ b/Makefile
@@ -70,10 +70,10 @@ endif
 %:
 	@true
 
-waku.nims:
-	ln -s waku.nimble $@
+logos_delivery.nims:
+	ln -s logos_delivery.nimble $@
 
-$(NIMBLEDEPS_STAMP): nimble.lock | install-nimble build-nph waku.nims
+$(NIMBLEDEPS_STAMP): nimble.lock | install-nimble build-nph logos_delivery.nims
 	$(NIMBLE) setup --localdeps
 	touch $@
 
@@ -91,8 +91,8 @@ clean:
 	rm nimble.paths 2> /dev/null || true
 	nimble clean
 
-REQUIRED_NIM_VERSION    := $(shell grep -E '^const RequiredNimVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
-REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const RequiredNimbleVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+REQUIRED_NIM_VERSION    := $(shell grep -E '^const RequiredNimVersion\s*=' logos_delivery.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const RequiredNimbleVersion\s*=' logos_delivery.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
 
 install-nim:
 ifneq ($(detected_OS),Windows)
@@ -218,7 +218,7 @@ testwaku: | build-deps build rln-deps librln
 		$(NIMBLE) test
 
 # Windows: build with nim directly — `nimble <task>` re-clones git deps every
-# build and they intermittently hang on the MSYS2 runner. Flags mirror waku.nimble.
+# build and they intermittently hang on the MSYS2 runner. Flags mirror logos_delivery.nimble.
 wakunode2: | build-deps build deps librln
 ifeq ($(detected_OS),Windows)
 	echo -e $(BUILD_MSG) "build/$@" && \
@@ -266,7 +266,7 @@ lightpushwithmix: | build-deps build deps librln
 
 api_example: | build-deps build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim api_example $(NIM_PARAMS) waku.nims
+		$(ENV_SCRIPT) nim api_example $(NIM_PARAMS) logos_delivery.nims
 
 build/%: | build-deps build deps librln
 	echo -e $(BUILD_MSG) "build/$*" && \
@@ -336,7 +336,7 @@ clean:
 
 docs: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(NIMBLE) doc --run --index:on --project --out:.gh-pages waku/waku.nim waku.nims
+		$(NIMBLE) doc --run --index:on --project --out:.gh-pages logos-delivery/logos-delivery.nim logos_delivery.nims
 
 coverage:
 	echo -e $(BUILD_MSG) "build/$@" && \
@@ -432,16 +432,16 @@ else ifeq ($(detected_OS),Linux)
 	BUILD_COMMAND := $(BUILD_COMMAND)Linux
 endif
 
-# Windows: build with nim directly (see wakunode2). Flags mirror waku.nimble.
+# Windows: build with nim directly (see wakunode2). Flags mirror logos_delivery.nimble.
 libwaku: | build-deps librln
 ifeq ($(detected_OS),Windows)
 	nim c --out:build/libwaku.dll --threads:on --app:lib --opt:speed --noMain --mm:refc --header -d:metrics --nimMainPrefix:libwaku --skipParentCfg:off -d:discv5_protocol_id=d5waku --cpu:amd64 $(NIM_PARAMS) library/libwaku.nim
 else
-	$(NIMBLE) --verbose libwaku$(BUILD_COMMAND) waku.nimble
+	$(NIMBLE) --verbose libwaku$(BUILD_COMMAND) logos_delivery.nimble
 endif
 
 liblogosdelivery: | build-deps librln
-	$(NIMBLE) --verbose liblogosdelivery$(BUILD_COMMAND) waku.nimble
+	$(NIMBLE) --verbose liblogosdelivery$(BUILD_COMMAND) logos_delivery.nimble
 
 logosdelivery_example: | build liblogosdelivery
 	@echo -e $(BUILD_MSG) "build/$@"
@@ -603,4 +603,4 @@ release-notes:
 		-u $(shell id -u) \
 		docker.io/wakuorg/sv4git:latest \
 			release-notes |\
-			sed -E 's@#([0-9]+)@[#\1](https://github.com/waku-org/nwaku/issues/\1)@g'
\ No newline at end of file
+			sed -E 's@#([0-9]+)@[#\1](https://github.com/logos-messaging/logos-delivery/issues/\1)@g'
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index be3a83f57..e61b76e9c 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -9,7 +9,7 @@ import
   libp2p/crypto/crypto
 import
   ../../tools/[rln_keystore_generator/rln_keystore_generator, confutils/cli_args],
-  waku/[
+  logos_delivery/waku/[
     common/logging,
     factory/waku,
     node/health_monitor,
diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs
index 2aa56543c..23e961435 100644
--- a/ci/Jenkinsfile.prs
+++ b/ci/Jenkinsfile.prs
@@ -124,7 +124,7 @@ def versionWasChanged(version) {
     script: "git diff --name-only origin/${env.CHANGE_TARGET}",
     returnStdout: true
   )
-  if (changes =~ "(?m)^(Makefile|waku.nimble|config.nims|vendor|ci|shell.nix).*") {
+  if (changes =~ "(?m)^(Makefile|logos_delivery.nimble|config.nims|vendor|ci|shell.nix).*") {
     return true
   }
   if (version == 'v2' && changes =~ "(?m)^(apps|tools)/.*") {
diff --git a/flake.nix b/flake.nix
index b32a53455..67f516359 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,11 +32,11 @@
       lib = nixpkgs.lib;
 
       # Single source of truth for the semver: the `version` field of
-      # waku.nimble. Kept in sync with git tags by the version-check CI.
+      # logos_delivery.nimble. Kept in sync with git tags by the version-check CI.
       nimbleVersion =
         let line = lib.findFirst (l: lib.hasPrefix "version = " l)
                      "version = \"unknown\""
-                     (lib.splitString "\n" (builtins.readFile ./waku.nimble));
+                     (lib.splitString "\n" (builtins.readFile ./logos_delivery.nimble));
         in lib.removeSuffix "\"" (lib.removePrefix "version = \"" line);
 
       # A flake sandbox has no .git, so `git describe` is impossible; the
diff --git a/waku.nim b/logos_delivery.nim
similarity index 73%
rename from waku.nim
rename to logos_delivery.nim
index 65a017c5a..c4edbe6d6 100644
--- a/waku.nim
+++ b/logos_delivery.nim
@@ -3,8 +3,8 @@
 ## This module re-exports the public API for creating and managing Waku nodes
 ## when using nwaku as a library dependency.
 
-import waku/api
+import logos_delivery/waku/api
 export api
 
-import waku/factory/waku
+import logos_delivery/waku/factory/waku
 export waku
diff --git a/waku.nimble b/logos_delivery.nimble
similarity index 99%
rename from waku.nimble
rename to logos_delivery.nimble
index 38548b5dc..db83d5690 100644
--- a/waku.nimble
+++ b/logos_delivery.nimble
@@ -6,8 +6,9 @@ mode = ScriptMode.Verbose
 ### Package
 version = "0.38.1"
 author = "Status Research & Development GmbH"
-description = "Waku, Private P2P Messaging for Resource-Restricted Devices"
+description = "Logos-delivery, Private P2P Messaging for Resource-Restricted Devices"
 license = "MIT or Apache License 2.0"
+skipDirs = @["tests", "examples", "tools", "apps", "simulations", "metrics"]
 
 const RequiredNimVersion = "2.2.4"
   ## This is the nim compiler version that we are working on. Other versions may behave differently.
diff --git a/channels/encryption/encryption.nim b/logos_delivery/channels/encryption/encryption.nim
similarity index 100%
rename from channels/encryption/encryption.nim
rename to logos_delivery/channels/encryption/encryption.nim
diff --git a/channels/encryption/noop_encryption.nim b/logos_delivery/channels/encryption/noop_encryption.nim
similarity index 100%
rename from channels/encryption/noop_encryption.nim
rename to logos_delivery/channels/encryption/noop_encryption.nim
diff --git a/channels/events.nim b/logos_delivery/channels/events.nim
similarity index 100%
rename from channels/events.nim
rename to logos_delivery/channels/events.nim
diff --git a/channels/rate_limit_manager/rate_limit_manager.nim b/logos_delivery/channels/rate_limit_manager/rate_limit_manager.nim
similarity index 100%
rename from channels/rate_limit_manager/rate_limit_manager.nim
rename to logos_delivery/channels/rate_limit_manager/rate_limit_manager.nim
diff --git a/channels/reliable_channel.nim b/logos_delivery/channels/reliable_channel.nim
similarity index 100%
rename from channels/reliable_channel.nim
rename to logos_delivery/channels/reliable_channel.nim
diff --git a/channels/reliable_channel_manager.nim b/logos_delivery/channels/reliable_channel_manager.nim
similarity index 100%
rename from channels/reliable_channel_manager.nim
rename to logos_delivery/channels/reliable_channel_manager.nim
diff --git a/channels/scalable_data_sync/scalable_data_sync.nim b/logos_delivery/channels/scalable_data_sync/scalable_data_sync.nim
similarity index 100%
rename from channels/scalable_data_sync/scalable_data_sync.nim
rename to logos_delivery/channels/scalable_data_sync/scalable_data_sync.nim
diff --git a/channels/scalable_data_sync/sds_persistence.nim b/logos_delivery/channels/scalable_data_sync/sds_persistence.nim
similarity index 100%
rename from channels/scalable_data_sync/sds_persistence.nim
rename to logos_delivery/channels/scalable_data_sync/sds_persistence.nim
diff --git a/channels/segmentation/segment_message_proto.nim b/logos_delivery/channels/segmentation/segment_message_proto.nim
similarity index 100%
rename from channels/segmentation/segment_message_proto.nim
rename to logos_delivery/channels/segmentation/segment_message_proto.nim
diff --git a/channels/segmentation/segmentation.nim b/logos_delivery/channels/segmentation/segmentation.nim
similarity index 100%
rename from channels/segmentation/segmentation.nim
rename to logos_delivery/channels/segmentation/segmentation.nim
diff --git a/channels/segmentation/segmentation_persistence.nim b/logos_delivery/channels/segmentation/segmentation_persistence.nim
similarity index 100%
rename from channels/segmentation/segmentation_persistence.nim
rename to logos_delivery/channels/segmentation/segmentation_persistence.nim
diff --git a/channels/types.nim b/logos_delivery/channels/types.nim
similarity index 100%
rename from channels/types.nim
rename to logos_delivery/channels/types.nim
diff --git a/messaging/delivery_service/not_delivered_storage/migrations.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim
similarity index 100%
rename from messaging/delivery_service/not_delivered_storage/migrations.nim
rename to logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim
diff --git a/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
similarity index 100%
rename from messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
rename to logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
diff --git a/messaging/delivery_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service.nim
similarity index 100%
rename from messaging/delivery_service/recv_service.nim
rename to logos_delivery/messaging/delivery_service/recv_service.nim
diff --git a/messaging/delivery_service/recv_service/recv_service.nim b/logos_delivery/messaging/delivery_service/recv_service/recv_service.nim
similarity index 100%
rename from messaging/delivery_service/recv_service/recv_service.nim
rename to logos_delivery/messaging/delivery_service/recv_service/recv_service.nim
diff --git a/messaging/delivery_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service.nim
similarity index 100%
rename from messaging/delivery_service/send_service.nim
rename to logos_delivery/messaging/delivery_service/send_service.nim
diff --git a/messaging/delivery_service/send_service/delivery_task.nim b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim
similarity index 100%
rename from messaging/delivery_service/send_service/delivery_task.nim
rename to logos_delivery/messaging/delivery_service/send_service/delivery_task.nim
diff --git a/messaging/delivery_service/send_service/lightpush_processor.nim b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim
similarity index 100%
rename from messaging/delivery_service/send_service/lightpush_processor.nim
rename to logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim
diff --git a/messaging/delivery_service/send_service/relay_processor.nim b/logos_delivery/messaging/delivery_service/send_service/relay_processor.nim
similarity index 100%
rename from messaging/delivery_service/send_service/relay_processor.nim
rename to logos_delivery/messaging/delivery_service/send_service/relay_processor.nim
diff --git a/messaging/delivery_service/send_service/send_processor.nim b/logos_delivery/messaging/delivery_service/send_service/send_processor.nim
similarity index 100%
rename from messaging/delivery_service/send_service/send_processor.nim
rename to logos_delivery/messaging/delivery_service/send_service/send_processor.nim
diff --git a/messaging/delivery_service/send_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service/send_service.nim
similarity index 100%
rename from messaging/delivery_service/send_service/send_service.nim
rename to logos_delivery/messaging/delivery_service/send_service/send_service.nim
diff --git a/messaging/messaging_client.nim b/logos_delivery/messaging/messaging_client.nim
similarity index 100%
rename from messaging/messaging_client.nim
rename to logos_delivery/messaging/messaging_client.nim
diff --git a/waku/README.md b/logos_delivery/waku/README.md
similarity index 100%
rename from waku/README.md
rename to logos_delivery/waku/README.md
diff --git a/waku/api.nim b/logos_delivery/waku/api.nim
similarity index 100%
rename from waku/api.nim
rename to logos_delivery/waku/api.nim
diff --git a/waku/api/api.nim b/logos_delivery/waku/api/api.nim
similarity index 100%
rename from waku/api/api.nim
rename to logos_delivery/waku/api/api.nim
diff --git a/waku/api/api_conf.nim b/logos_delivery/waku/api/api_conf.nim
similarity index 100%
rename from waku/api/api_conf.nim
rename to logos_delivery/waku/api/api_conf.nim
diff --git a/waku/api/send_api.md b/logos_delivery/waku/api/send_api.md
similarity index 100%
rename from waku/api/send_api.md
rename to logos_delivery/waku/api/send_api.md
diff --git a/waku/api/types.nim b/logos_delivery/waku/api/types.nim
similarity index 100%
rename from waku/api/types.nim
rename to logos_delivery/waku/api/types.nim
diff --git a/waku/common/base64.nim b/logos_delivery/waku/common/base64.nim
similarity index 100%
rename from waku/common/base64.nim
rename to logos_delivery/waku/common/base64.nim
diff --git a/waku/common/callbacks.nim b/logos_delivery/waku/common/callbacks.nim
similarity index 100%
rename from waku/common/callbacks.nim
rename to logos_delivery/waku/common/callbacks.nim
diff --git a/waku/common/databases/common.nim b/logos_delivery/waku/common/databases/common.nim
similarity index 100%
rename from waku/common/databases/common.nim
rename to logos_delivery/waku/common/databases/common.nim
diff --git a/waku/common/databases/db_postgres.nim b/logos_delivery/waku/common/databases/db_postgres.nim
similarity index 100%
rename from waku/common/databases/db_postgres.nim
rename to logos_delivery/waku/common/databases/db_postgres.nim
diff --git a/waku/common/databases/db_postgres/dbconn.nim b/logos_delivery/waku/common/databases/db_postgres/dbconn.nim
similarity index 100%
rename from waku/common/databases/db_postgres/dbconn.nim
rename to logos_delivery/waku/common/databases/db_postgres/dbconn.nim
diff --git a/waku/common/databases/db_postgres/pgasyncpool.nim b/logos_delivery/waku/common/databases/db_postgres/pgasyncpool.nim
similarity index 100%
rename from waku/common/databases/db_postgres/pgasyncpool.nim
rename to logos_delivery/waku/common/databases/db_postgres/pgasyncpool.nim
diff --git a/waku/common/databases/db_postgres/query_metrics.nim b/logos_delivery/waku/common/databases/db_postgres/query_metrics.nim
similarity index 100%
rename from waku/common/databases/db_postgres/query_metrics.nim
rename to logos_delivery/waku/common/databases/db_postgres/query_metrics.nim
diff --git a/waku/common/databases/db_sqlite.nim b/logos_delivery/waku/common/databases/db_sqlite.nim
similarity index 100%
rename from waku/common/databases/db_sqlite.nim
rename to logos_delivery/waku/common/databases/db_sqlite.nim
diff --git a/waku/common/databases/dburl.nim b/logos_delivery/waku/common/databases/dburl.nim
similarity index 100%
rename from waku/common/databases/dburl.nim
rename to logos_delivery/waku/common/databases/dburl.nim
diff --git a/waku/common/enr.nim b/logos_delivery/waku/common/enr.nim
similarity index 100%
rename from waku/common/enr.nim
rename to logos_delivery/waku/common/enr.nim
diff --git a/waku/common/enr/builder.nim b/logos_delivery/waku/common/enr/builder.nim
similarity index 100%
rename from waku/common/enr/builder.nim
rename to logos_delivery/waku/common/enr/builder.nim
diff --git a/waku/common/enr/typed_record.nim b/logos_delivery/waku/common/enr/typed_record.nim
similarity index 100%
rename from waku/common/enr/typed_record.nim
rename to logos_delivery/waku/common/enr/typed_record.nim
diff --git a/waku/common/error_handling.nim b/logos_delivery/waku/common/error_handling.nim
similarity index 100%
rename from waku/common/error_handling.nim
rename to logos_delivery/waku/common/error_handling.nim
diff --git a/waku/common/hexstrings.nim b/logos_delivery/waku/common/hexstrings.nim
similarity index 100%
rename from waku/common/hexstrings.nim
rename to logos_delivery/waku/common/hexstrings.nim
diff --git a/waku/common/logging.nim b/logos_delivery/waku/common/logging.nim
similarity index 100%
rename from waku/common/logging.nim
rename to logos_delivery/waku/common/logging.nim
diff --git a/waku/common/nimchronos.nim b/logos_delivery/waku/common/nimchronos.nim
similarity index 100%
rename from waku/common/nimchronos.nim
rename to logos_delivery/waku/common/nimchronos.nim
diff --git a/waku/common/paging.nim b/logos_delivery/waku/common/paging.nim
similarity index 100%
rename from waku/common/paging.nim
rename to logos_delivery/waku/common/paging.nim
diff --git a/waku/common/protobuf.nim b/logos_delivery/waku/common/protobuf.nim
similarity index 100%
rename from waku/common/protobuf.nim
rename to logos_delivery/waku/common/protobuf.nim
diff --git a/waku/common/rate_limit/per_peer_limiter.nim b/logos_delivery/waku/common/rate_limit/per_peer_limiter.nim
similarity index 100%
rename from waku/common/rate_limit/per_peer_limiter.nim
rename to logos_delivery/waku/common/rate_limit/per_peer_limiter.nim
diff --git a/waku/common/rate_limit/request_limiter.nim b/logos_delivery/waku/common/rate_limit/request_limiter.nim
similarity index 100%
rename from waku/common/rate_limit/request_limiter.nim
rename to logos_delivery/waku/common/rate_limit/request_limiter.nim
diff --git a/waku/common/rate_limit/service_metrics.nim b/logos_delivery/waku/common/rate_limit/service_metrics.nim
similarity index 100%
rename from waku/common/rate_limit/service_metrics.nim
rename to logos_delivery/waku/common/rate_limit/service_metrics.nim
diff --git a/waku/common/rate_limit/setting.nim b/logos_delivery/waku/common/rate_limit/setting.nim
similarity index 100%
rename from waku/common/rate_limit/setting.nim
rename to logos_delivery/waku/common/rate_limit/setting.nim
diff --git a/waku/common/rate_limit/single_token_limiter.nim b/logos_delivery/waku/common/rate_limit/single_token_limiter.nim
similarity index 100%
rename from waku/common/rate_limit/single_token_limiter.nim
rename to logos_delivery/waku/common/rate_limit/single_token_limiter.nim
diff --git a/waku/common/rate_limit/timed_map.nim b/logos_delivery/waku/common/rate_limit/timed_map.nim
similarity index 100%
rename from waku/common/rate_limit/timed_map.nim
rename to logos_delivery/waku/common/rate_limit/timed_map.nim
diff --git a/waku/common/utils/DEPRECATION_NOTICE.md b/logos_delivery/waku/common/utils/DEPRECATION_NOTICE.md
similarity index 100%
rename from waku/common/utils/DEPRECATION_NOTICE.md
rename to logos_delivery/waku/common/utils/DEPRECATION_NOTICE.md
diff --git a/waku/common/utils/matterbridge_client.nim b/logos_delivery/waku/common/utils/matterbridge_client.nim
similarity index 100%
rename from waku/common/utils/matterbridge_client.nim
rename to logos_delivery/waku/common/utils/matterbridge_client.nim
diff --git a/waku/common/utils/nat.nim b/logos_delivery/waku/common/utils/nat.nim
similarity index 100%
rename from waku/common/utils/nat.nim
rename to logos_delivery/waku/common/utils/nat.nim
diff --git a/waku/common/utils/parse_size_units.nim b/logos_delivery/waku/common/utils/parse_size_units.nim
similarity index 100%
rename from waku/common/utils/parse_size_units.nim
rename to logos_delivery/waku/common/utils/parse_size_units.nim
diff --git a/waku/common/utils/sequence.nim b/logos_delivery/waku/common/utils/sequence.nim
similarity index 100%
rename from waku/common/utils/sequence.nim
rename to logos_delivery/waku/common/utils/sequence.nim
diff --git a/waku/common/waku_protocol.nim b/logos_delivery/waku/common/waku_protocol.nim
similarity index 100%
rename from waku/common/waku_protocol.nim
rename to logos_delivery/waku/common/waku_protocol.nim
diff --git a/waku/discovery/autonat_service.nim b/logos_delivery/waku/discovery/autonat_service.nim
similarity index 100%
rename from waku/discovery/autonat_service.nim
rename to logos_delivery/waku/discovery/autonat_service.nim
diff --git a/waku/discovery/waku_discv5.nim b/logos_delivery/waku/discovery/waku_discv5.nim
similarity index 100%
rename from waku/discovery/waku_discv5.nim
rename to logos_delivery/waku/discovery/waku_discv5.nim
diff --git a/waku/discovery/waku_dnsdisc.nim b/logos_delivery/waku/discovery/waku_dnsdisc.nim
similarity index 100%
rename from waku/discovery/waku_dnsdisc.nim
rename to logos_delivery/waku/discovery/waku_dnsdisc.nim
diff --git a/waku/discovery/waku_kademlia.nim b/logos_delivery/waku/discovery/waku_kademlia.nim
similarity index 100%
rename from waku/discovery/waku_kademlia.nim
rename to logos_delivery/waku/discovery/waku_kademlia.nim
diff --git a/waku/events/delivery_events.nim b/logos_delivery/waku/events/delivery_events.nim
similarity index 100%
rename from waku/events/delivery_events.nim
rename to logos_delivery/waku/events/delivery_events.nim
diff --git a/waku/events/events.nim b/logos_delivery/waku/events/events.nim
similarity index 100%
rename from waku/events/events.nim
rename to logos_delivery/waku/events/events.nim
diff --git a/waku/events/health_events.nim b/logos_delivery/waku/events/health_events.nim
similarity index 100%
rename from waku/events/health_events.nim
rename to logos_delivery/waku/events/health_events.nim
diff --git a/waku/events/message_events.nim b/logos_delivery/waku/events/message_events.nim
similarity index 100%
rename from waku/events/message_events.nim
rename to logos_delivery/waku/events/message_events.nim
diff --git a/waku/events/peer_events.nim b/logos_delivery/waku/events/peer_events.nim
similarity index 100%
rename from waku/events/peer_events.nim
rename to logos_delivery/waku/events/peer_events.nim
diff --git a/waku/factory/app_callbacks.nim b/logos_delivery/waku/factory/app_callbacks.nim
similarity index 100%
rename from waku/factory/app_callbacks.nim
rename to logos_delivery/waku/factory/app_callbacks.nim
diff --git a/waku/factory/builder.nim b/logos_delivery/waku/factory/builder.nim
similarity index 100%
rename from waku/factory/builder.nim
rename to logos_delivery/waku/factory/builder.nim
diff --git a/waku/factory/conf_builder/conf_builder.nim b/logos_delivery/waku/factory/conf_builder/conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/conf_builder.nim
diff --git a/waku/factory/conf_builder/discv5_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/discv5_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/discv5_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/discv5_conf_builder.nim
diff --git a/waku/factory/conf_builder/dns_discovery_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/dns_discovery_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/dns_discovery_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/dns_discovery_conf_builder.nim
diff --git a/waku/factory/conf_builder/filter_service_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/filter_service_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/filter_service_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/filter_service_conf_builder.nim
diff --git a/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/kademlia_discovery_conf_builder.nim
diff --git a/waku/factory/conf_builder/metrics_server_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/metrics_server_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/metrics_server_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/metrics_server_conf_builder.nim
diff --git a/waku/factory/conf_builder/mix_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/mix_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/mix_conf_builder.nim
diff --git a/waku/factory/conf_builder/rate_limit_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/rate_limit_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/rate_limit_conf_builder.nim
diff --git a/waku/factory/conf_builder/rest_server_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rest_server_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/rest_server_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/rest_server_conf_builder.nim
diff --git a/waku/factory/conf_builder/rln_relay_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/rln_relay_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/rln_relay_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/rln_relay_conf_builder.nim
diff --git a/waku/factory/conf_builder/store_service_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/store_service_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/store_service_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/store_service_conf_builder.nim
diff --git a/waku/factory/conf_builder/store_sync_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/store_sync_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/store_sync_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/store_sync_conf_builder.nim
diff --git a/waku/factory/conf_builder/waku_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/waku_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/waku_conf_builder.nim
diff --git a/waku/factory/conf_builder/web_socket_conf_builder.nim b/logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim
similarity index 100%
rename from waku/factory/conf_builder/web_socket_conf_builder.nim
rename to logos_delivery/waku/factory/conf_builder/web_socket_conf_builder.nim
diff --git a/waku/factory/internal_config.nim b/logos_delivery/waku/factory/internal_config.nim
similarity index 100%
rename from waku/factory/internal_config.nim
rename to logos_delivery/waku/factory/internal_config.nim
diff --git a/waku/factory/networks_config.nim b/logos_delivery/waku/factory/networks_config.nim
similarity index 100%
rename from waku/factory/networks_config.nim
rename to logos_delivery/waku/factory/networks_config.nim
diff --git a/waku/factory/node_factory.nim b/logos_delivery/waku/factory/node_factory.nim
similarity index 100%
rename from waku/factory/node_factory.nim
rename to logos_delivery/waku/factory/node_factory.nim
diff --git a/waku/factory/validator_signed.nim b/logos_delivery/waku/factory/validator_signed.nim
similarity index 100%
rename from waku/factory/validator_signed.nim
rename to logos_delivery/waku/factory/validator_signed.nim
diff --git a/waku/factory/waku.nim b/logos_delivery/waku/factory/waku.nim
similarity index 100%
rename from waku/factory/waku.nim
rename to logos_delivery/waku/factory/waku.nim
diff --git a/waku/factory/waku_conf.nim b/logos_delivery/waku/factory/waku_conf.nim
similarity index 100%
rename from waku/factory/waku_conf.nim
rename to logos_delivery/waku/factory/waku_conf.nim
diff --git a/waku/factory/waku_state_info.nim b/logos_delivery/waku/factory/waku_state_info.nim
similarity index 100%
rename from waku/factory/waku_state_info.nim
rename to logos_delivery/waku/factory/waku_state_info.nim
diff --git a/waku/incentivization/common.nim b/logos_delivery/waku/incentivization/common.nim
similarity index 100%
rename from waku/incentivization/common.nim
rename to logos_delivery/waku/incentivization/common.nim
diff --git a/waku/incentivization/eligibility_manager.nim b/logos_delivery/waku/incentivization/eligibility_manager.nim
similarity index 100%
rename from waku/incentivization/eligibility_manager.nim
rename to logos_delivery/waku/incentivization/eligibility_manager.nim
diff --git a/waku/incentivization/reputation_manager.nim b/logos_delivery/waku/incentivization/reputation_manager.nim
similarity index 100%
rename from waku/incentivization/reputation_manager.nim
rename to logos_delivery/waku/incentivization/reputation_manager.nim
diff --git a/waku/incentivization/rpc.nim b/logos_delivery/waku/incentivization/rpc.nim
similarity index 100%
rename from waku/incentivization/rpc.nim
rename to logos_delivery/waku/incentivization/rpc.nim
diff --git a/waku/incentivization/rpc_codec.nim b/logos_delivery/waku/incentivization/rpc_codec.nim
similarity index 100%
rename from waku/incentivization/rpc_codec.nim
rename to logos_delivery/waku/incentivization/rpc_codec.nim
diff --git a/waku/net/auto_port.nim b/logos_delivery/waku/net/auto_port.nim
similarity index 100%
rename from waku/net/auto_port.nim
rename to logos_delivery/waku/net/auto_port.nim
diff --git a/waku/net/bound_ports.nim b/logos_delivery/waku/net/bound_ports.nim
similarity index 100%
rename from waku/net/bound_ports.nim
rename to logos_delivery/waku/net/bound_ports.nim
diff --git a/waku/net/net_config.nim b/logos_delivery/waku/net/net_config.nim
similarity index 100%
rename from waku/net/net_config.nim
rename to logos_delivery/waku/net/net_config.nim
diff --git a/waku/node/edge_filter_sub_state.nim b/logos_delivery/waku/node/edge_filter_sub_state.nim
similarity index 100%
rename from waku/node/edge_filter_sub_state.nim
rename to logos_delivery/waku/node/edge_filter_sub_state.nim
diff --git a/waku/node/health_monitor.nim b/logos_delivery/waku/node/health_monitor.nim
similarity index 100%
rename from waku/node/health_monitor.nim
rename to logos_delivery/waku/node/health_monitor.nim
diff --git a/waku/node/health_monitor/connection_status.nim b/logos_delivery/waku/node/health_monitor/connection_status.nim
similarity index 100%
rename from waku/node/health_monitor/connection_status.nim
rename to logos_delivery/waku/node/health_monitor/connection_status.nim
diff --git a/waku/node/health_monitor/event_loop_monitor.nim b/logos_delivery/waku/node/health_monitor/event_loop_monitor.nim
similarity index 100%
rename from waku/node/health_monitor/event_loop_monitor.nim
rename to logos_delivery/waku/node/health_monitor/event_loop_monitor.nim
diff --git a/waku/node/health_monitor/health_report.nim b/logos_delivery/waku/node/health_monitor/health_report.nim
similarity index 100%
rename from waku/node/health_monitor/health_report.nim
rename to logos_delivery/waku/node/health_monitor/health_report.nim
diff --git a/waku/node/health_monitor/health_status.nim b/logos_delivery/waku/node/health_monitor/health_status.nim
similarity index 100%
rename from waku/node/health_monitor/health_status.nim
rename to logos_delivery/waku/node/health_monitor/health_status.nim
diff --git a/waku/node/health_monitor/node_health_monitor.nim b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
similarity index 100%
rename from waku/node/health_monitor/node_health_monitor.nim
rename to logos_delivery/waku/node/health_monitor/node_health_monitor.nim
diff --git a/waku/node/health_monitor/online_monitor.nim b/logos_delivery/waku/node/health_monitor/online_monitor.nim
similarity index 100%
rename from waku/node/health_monitor/online_monitor.nim
rename to logos_delivery/waku/node/health_monitor/online_monitor.nim
diff --git a/waku/node/health_monitor/protocol_health.nim b/logos_delivery/waku/node/health_monitor/protocol_health.nim
similarity index 100%
rename from waku/node/health_monitor/protocol_health.nim
rename to logos_delivery/waku/node/health_monitor/protocol_health.nim
diff --git a/waku/node/health_monitor/topic_health.nim b/logos_delivery/waku/node/health_monitor/topic_health.nim
similarity index 100%
rename from waku/node/health_monitor/topic_health.nim
rename to logos_delivery/waku/node/health_monitor/topic_health.nim
diff --git a/waku/node/node_telemetry.nim b/logos_delivery/waku/node/node_telemetry.nim
similarity index 100%
rename from waku/node/node_telemetry.nim
rename to logos_delivery/waku/node/node_telemetry.nim
diff --git a/waku/node/peer_manager.nim b/logos_delivery/waku/node/peer_manager.nim
similarity index 100%
rename from waku/node/peer_manager.nim
rename to logos_delivery/waku/node/peer_manager.nim
diff --git a/waku/node/peer_manager/peer_manager.nim b/logos_delivery/waku/node/peer_manager/peer_manager.nim
similarity index 100%
rename from waku/node/peer_manager/peer_manager.nim
rename to logos_delivery/waku/node/peer_manager/peer_manager.nim
diff --git a/waku/node/peer_manager/peer_store/migrations.nim b/logos_delivery/waku/node/peer_manager/peer_store/migrations.nim
similarity index 100%
rename from waku/node/peer_manager/peer_store/migrations.nim
rename to logos_delivery/waku/node/peer_manager/peer_store/migrations.nim
diff --git a/waku/node/peer_manager/peer_store/peer_storage.nim b/logos_delivery/waku/node/peer_manager/peer_store/peer_storage.nim
similarity index 100%
rename from waku/node/peer_manager/peer_store/peer_storage.nim
rename to logos_delivery/waku/node/peer_manager/peer_store/peer_storage.nim
diff --git a/waku/node/peer_manager/peer_store/waku_peer_storage.nim b/logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage.nim
similarity index 100%
rename from waku/node/peer_manager/peer_store/waku_peer_storage.nim
rename to logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage.nim
diff --git a/waku/node/peer_manager/waku_peer_store.nim b/logos_delivery/waku/node/peer_manager/waku_peer_store.nim
similarity index 100%
rename from waku/node/peer_manager/waku_peer_store.nim
rename to logos_delivery/waku/node/peer_manager/waku_peer_store.nim
diff --git a/waku/node/shard_subscription.nim b/logos_delivery/waku/node/shard_subscription.nim
similarity index 100%
rename from waku/node/shard_subscription.nim
rename to logos_delivery/waku/node/shard_subscription.nim
diff --git a/waku/node/subscription_manager.nim b/logos_delivery/waku/node/subscription_manager.nim
similarity index 100%
rename from waku/node/subscription_manager.nim
rename to logos_delivery/waku/node/subscription_manager.nim
diff --git a/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim
similarity index 100%
rename from waku/node/waku_metrics.nim
rename to logos_delivery/waku/node/waku_metrics.nim
diff --git a/waku/node/waku_node.nim b/logos_delivery/waku/node/waku_node.nim
similarity index 100%
rename from waku/node/waku_node.nim
rename to logos_delivery/waku/node/waku_node.nim
diff --git a/waku/node/waku_node/filter.nim b/logos_delivery/waku/node/waku_node/filter.nim
similarity index 100%
rename from waku/node/waku_node/filter.nim
rename to logos_delivery/waku/node/waku_node/filter.nim
diff --git a/waku/node/waku_node/lightpush.nim b/logos_delivery/waku/node/waku_node/lightpush.nim
similarity index 100%
rename from waku/node/waku_node/lightpush.nim
rename to logos_delivery/waku/node/waku_node/lightpush.nim
diff --git a/waku/node/waku_node/peer_exchange.nim b/logos_delivery/waku/node/waku_node/peer_exchange.nim
similarity index 100%
rename from waku/node/waku_node/peer_exchange.nim
rename to logos_delivery/waku/node/waku_node/peer_exchange.nim
diff --git a/waku/node/waku_node/ping.nim b/logos_delivery/waku/node/waku_node/ping.nim
similarity index 100%
rename from waku/node/waku_node/ping.nim
rename to logos_delivery/waku/node/waku_node/ping.nim
diff --git a/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim
similarity index 100%
rename from waku/node/waku_node/relay.nim
rename to logos_delivery/waku/node/waku_node/relay.nim
diff --git a/waku/node/waku_node/store.nim b/logos_delivery/waku/node/waku_node/store.nim
similarity index 100%
rename from waku/node/waku_node/store.nim
rename to logos_delivery/waku/node/waku_node/store.nim
diff --git a/waku/node/waku_switch.nim b/logos_delivery/waku/node/waku_switch.nim
similarity index 100%
rename from waku/node/waku_switch.nim
rename to logos_delivery/waku/node/waku_switch.nim
diff --git a/waku/persistency/backend_comm.nim b/logos_delivery/waku/persistency/backend_comm.nim
similarity index 100%
rename from waku/persistency/backend_comm.nim
rename to logos_delivery/waku/persistency/backend_comm.nim
diff --git a/waku/persistency/backend_sqlite.nim b/logos_delivery/waku/persistency/backend_sqlite.nim
similarity index 100%
rename from waku/persistency/backend_sqlite.nim
rename to logos_delivery/waku/persistency/backend_sqlite.nim
diff --git a/waku/persistency/backend_thread.nim b/logos_delivery/waku/persistency/backend_thread.nim
similarity index 100%
rename from waku/persistency/backend_thread.nim
rename to logos_delivery/waku/persistency/backend_thread.nim
diff --git a/waku/persistency/keys.nim b/logos_delivery/waku/persistency/keys.nim
similarity index 100%
rename from waku/persistency/keys.nim
rename to logos_delivery/waku/persistency/keys.nim
diff --git a/waku/persistency/payload.nim b/logos_delivery/waku/persistency/payload.nim
similarity index 100%
rename from waku/persistency/payload.nim
rename to logos_delivery/waku/persistency/payload.nim
diff --git a/waku/persistency/persistency.nim b/logos_delivery/waku/persistency/persistency.nim
similarity index 100%
rename from waku/persistency/persistency.nim
rename to logos_delivery/waku/persistency/persistency.nim
diff --git a/waku/persistency/schema.nim b/logos_delivery/waku/persistency/schema.nim
similarity index 100%
rename from waku/persistency/schema.nim
rename to logos_delivery/waku/persistency/schema.nim
diff --git a/waku/persistency/sds_persistency.nim b/logos_delivery/waku/persistency/sds_persistency.nim
similarity index 100%
rename from waku/persistency/sds_persistency.nim
rename to logos_delivery/waku/persistency/sds_persistency.nim
diff --git a/waku/persistency/types.nim b/logos_delivery/waku/persistency/types.nim
similarity index 100%
rename from waku/persistency/types.nim
rename to logos_delivery/waku/persistency/types.nim
diff --git a/waku/requests/health_requests.nim b/logos_delivery/waku/requests/health_requests.nim
similarity index 100%
rename from waku/requests/health_requests.nim
rename to logos_delivery/waku/requests/health_requests.nim
diff --git a/waku/requests/node_requests.nim b/logos_delivery/waku/requests/node_requests.nim
similarity index 100%
rename from waku/requests/node_requests.nim
rename to logos_delivery/waku/requests/node_requests.nim
diff --git a/waku/requests/requests.nim b/logos_delivery/waku/requests/requests.nim
similarity index 100%
rename from waku/requests/requests.nim
rename to logos_delivery/waku/requests/requests.nim
diff --git a/waku/requests/rln_requests.nim b/logos_delivery/waku/requests/rln_requests.nim
similarity index 100%
rename from waku/requests/rln_requests.nim
rename to logos_delivery/waku/requests/rln_requests.nim
diff --git a/waku/rest_api/endpoint/admin/client.nim b/logos_delivery/waku/rest_api/endpoint/admin/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/admin/client.nim
rename to logos_delivery/waku/rest_api/endpoint/admin/client.nim
diff --git a/waku/rest_api/endpoint/admin/handlers.nim b/logos_delivery/waku/rest_api/endpoint/admin/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/admin/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/admin/handlers.nim
diff --git a/waku/rest_api/endpoint/admin/types.nim b/logos_delivery/waku/rest_api/endpoint/admin/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/admin/types.nim
rename to logos_delivery/waku/rest_api/endpoint/admin/types.nim
diff --git a/waku/rest_api/endpoint/builder.nim b/logos_delivery/waku/rest_api/endpoint/builder.nim
similarity index 100%
rename from waku/rest_api/endpoint/builder.nim
rename to logos_delivery/waku/rest_api/endpoint/builder.nim
diff --git a/waku/rest_api/endpoint/client.nim b/logos_delivery/waku/rest_api/endpoint/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/client.nim
rename to logos_delivery/waku/rest_api/endpoint/client.nim
diff --git a/waku/rest_api/endpoint/debug/client.nim b/logos_delivery/waku/rest_api/endpoint/debug/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/debug/client.nim
rename to logos_delivery/waku/rest_api/endpoint/debug/client.nim
diff --git a/waku/rest_api/endpoint/debug/handlers.nim b/logos_delivery/waku/rest_api/endpoint/debug/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/debug/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/debug/handlers.nim
diff --git a/waku/rest_api/endpoint/debug/types.nim b/logos_delivery/waku/rest_api/endpoint/debug/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/debug/types.nim
rename to logos_delivery/waku/rest_api/endpoint/debug/types.nim
diff --git a/waku/rest_api/endpoint/filter/client.nim b/logos_delivery/waku/rest_api/endpoint/filter/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/filter/client.nim
rename to logos_delivery/waku/rest_api/endpoint/filter/client.nim
diff --git a/waku/rest_api/endpoint/filter/handlers.nim b/logos_delivery/waku/rest_api/endpoint/filter/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/filter/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/filter/handlers.nim
diff --git a/waku/rest_api/endpoint/filter/types.nim b/logos_delivery/waku/rest_api/endpoint/filter/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/filter/types.nim
rename to logos_delivery/waku/rest_api/endpoint/filter/types.nim
diff --git a/waku/rest_api/endpoint/health/client.nim b/logos_delivery/waku/rest_api/endpoint/health/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/health/client.nim
rename to logos_delivery/waku/rest_api/endpoint/health/client.nim
diff --git a/waku/rest_api/endpoint/health/handlers.nim b/logos_delivery/waku/rest_api/endpoint/health/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/health/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/health/handlers.nim
diff --git a/waku/rest_api/endpoint/health/types.nim b/logos_delivery/waku/rest_api/endpoint/health/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/health/types.nim
rename to logos_delivery/waku/rest_api/endpoint/health/types.nim
diff --git a/waku/rest_api/endpoint/legacy_lightpush/client.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/legacy_lightpush/client.nim
rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/client.nim
diff --git a/waku/rest_api/endpoint/legacy_lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/legacy_lightpush/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers.nim
diff --git a/waku/rest_api/endpoint/legacy_lightpush/types.nim b/logos_delivery/waku/rest_api/endpoint/legacy_lightpush/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/legacy_lightpush/types.nim
rename to logos_delivery/waku/rest_api/endpoint/legacy_lightpush/types.nim
diff --git a/waku/rest_api/endpoint/lightpush/client.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/lightpush/client.nim
rename to logos_delivery/waku/rest_api/endpoint/lightpush/client.nim
diff --git a/waku/rest_api/endpoint/lightpush/handlers.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/lightpush/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/lightpush/handlers.nim
diff --git a/waku/rest_api/endpoint/lightpush/types.nim b/logos_delivery/waku/rest_api/endpoint/lightpush/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/lightpush/types.nim
rename to logos_delivery/waku/rest_api/endpoint/lightpush/types.nim
diff --git a/waku/rest_api/endpoint/origin_handler.nim b/logos_delivery/waku/rest_api/endpoint/origin_handler.nim
similarity index 100%
rename from waku/rest_api/endpoint/origin_handler.nim
rename to logos_delivery/waku/rest_api/endpoint/origin_handler.nim
diff --git a/waku/rest_api/endpoint/relay/client.nim b/logos_delivery/waku/rest_api/endpoint/relay/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/relay/client.nim
rename to logos_delivery/waku/rest_api/endpoint/relay/client.nim
diff --git a/waku/rest_api/endpoint/relay/handlers.nim b/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/relay/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/relay/handlers.nim
diff --git a/waku/rest_api/endpoint/relay/types.nim b/logos_delivery/waku/rest_api/endpoint/relay/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/relay/types.nim
rename to logos_delivery/waku/rest_api/endpoint/relay/types.nim
diff --git a/waku/rest_api/endpoint/responses.nim b/logos_delivery/waku/rest_api/endpoint/responses.nim
similarity index 100%
rename from waku/rest_api/endpoint/responses.nim
rename to logos_delivery/waku/rest_api/endpoint/responses.nim
diff --git a/waku/rest_api/endpoint/rest_serdes.nim b/logos_delivery/waku/rest_api/endpoint/rest_serdes.nim
similarity index 100%
rename from waku/rest_api/endpoint/rest_serdes.nim
rename to logos_delivery/waku/rest_api/endpoint/rest_serdes.nim
diff --git a/waku/rest_api/endpoint/serdes.nim b/logos_delivery/waku/rest_api/endpoint/serdes.nim
similarity index 100%
rename from waku/rest_api/endpoint/serdes.nim
rename to logos_delivery/waku/rest_api/endpoint/serdes.nim
diff --git a/waku/rest_api/endpoint/server.nim b/logos_delivery/waku/rest_api/endpoint/server.nim
similarity index 100%
rename from waku/rest_api/endpoint/server.nim
rename to logos_delivery/waku/rest_api/endpoint/server.nim
diff --git a/waku/rest_api/endpoint/store/client.nim b/logos_delivery/waku/rest_api/endpoint/store/client.nim
similarity index 100%
rename from waku/rest_api/endpoint/store/client.nim
rename to logos_delivery/waku/rest_api/endpoint/store/client.nim
diff --git a/waku/rest_api/endpoint/store/handlers.nim b/logos_delivery/waku/rest_api/endpoint/store/handlers.nim
similarity index 100%
rename from waku/rest_api/endpoint/store/handlers.nim
rename to logos_delivery/waku/rest_api/endpoint/store/handlers.nim
diff --git a/waku/rest_api/endpoint/store/types.nim b/logos_delivery/waku/rest_api/endpoint/store/types.nim
similarity index 100%
rename from waku/rest_api/endpoint/store/types.nim
rename to logos_delivery/waku/rest_api/endpoint/store/types.nim
diff --git a/waku/rest_api/handlers.nim b/logos_delivery/waku/rest_api/handlers.nim
similarity index 100%
rename from waku/rest_api/handlers.nim
rename to logos_delivery/waku/rest_api/handlers.nim
diff --git a/waku/rest_api/message_cache.nim b/logos_delivery/waku/rest_api/message_cache.nim
similarity index 100%
rename from waku/rest_api/message_cache.nim
rename to logos_delivery/waku/rest_api/message_cache.nim
diff --git a/waku/utils/DEPRECATION_NOTICE.md b/logos_delivery/waku/utils/DEPRECATION_NOTICE.md
similarity index 100%
rename from waku/utils/DEPRECATION_NOTICE.md
rename to logos_delivery/waku/utils/DEPRECATION_NOTICE.md
diff --git a/waku/utils/collector.nim b/logos_delivery/waku/utils/collector.nim
similarity index 100%
rename from waku/utils/collector.nim
rename to logos_delivery/waku/utils/collector.nim
diff --git a/waku/utils/noise.nim b/logos_delivery/waku/utils/noise.nim
similarity index 100%
rename from waku/utils/noise.nim
rename to logos_delivery/waku/utils/noise.nim
diff --git a/waku/utils/requests.nim b/logos_delivery/waku/utils/requests.nim
similarity index 100%
rename from waku/utils/requests.nim
rename to logos_delivery/waku/utils/requests.nim
diff --git a/waku/utils/tableutils.nim b/logos_delivery/waku/utils/tableutils.nim
similarity index 100%
rename from waku/utils/tableutils.nim
rename to logos_delivery/waku/utils/tableutils.nim
diff --git a/waku/waku_archive.nim b/logos_delivery/waku/waku_archive.nim
similarity index 100%
rename from waku/waku_archive.nim
rename to logos_delivery/waku/waku_archive.nim
diff --git a/waku/waku_archive/archive.nim b/logos_delivery/waku/waku_archive/archive.nim
similarity index 100%
rename from waku/waku_archive/archive.nim
rename to logos_delivery/waku/waku_archive/archive.nim
diff --git a/waku/waku_archive/archive_metrics.nim b/logos_delivery/waku/waku_archive/archive_metrics.nim
similarity index 100%
rename from waku/waku_archive/archive_metrics.nim
rename to logos_delivery/waku/waku_archive/archive_metrics.nim
diff --git a/waku/waku_archive/common.nim b/logos_delivery/waku/waku_archive/common.nim
similarity index 100%
rename from waku/waku_archive/common.nim
rename to logos_delivery/waku/waku_archive/common.nim
diff --git a/waku/waku_archive/driver.nim b/logos_delivery/waku/waku_archive/driver.nim
similarity index 100%
rename from waku/waku_archive/driver.nim
rename to logos_delivery/waku/waku_archive/driver.nim
diff --git a/waku/waku_archive/driver/builder.nim b/logos_delivery/waku/waku_archive/driver/builder.nim
similarity index 100%
rename from waku/waku_archive/driver/builder.nim
rename to logos_delivery/waku/waku_archive/driver/builder.nim
diff --git a/waku/waku_archive/driver/postgres_driver.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/postgres_driver.nim
rename to logos_delivery/waku/waku_archive/driver/postgres_driver.nim
diff --git a/waku/waku_archive/driver/postgres_driver/migrations.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/migrations.nim
similarity index 100%
rename from waku/waku_archive/driver/postgres_driver/migrations.nim
rename to logos_delivery/waku/waku_archive/driver/postgres_driver/migrations.nim
diff --git a/waku/waku_archive/driver/postgres_driver/partitions_manager.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager.nim
similarity index 100%
rename from waku/waku_archive/driver/postgres_driver/partitions_manager.nim
rename to logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager.nim
diff --git a/waku/waku_archive/driver/postgres_driver/postgres_driver.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/postgres_driver/postgres_driver.nim
rename to logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_driver.nim
diff --git a/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim b/logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim
similarity index 100%
rename from waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim
rename to logos_delivery/waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim
diff --git a/waku/waku_archive/driver/queue_driver.nim b/logos_delivery/waku/waku_archive/driver/queue_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/queue_driver.nim
rename to logos_delivery/waku/waku_archive/driver/queue_driver.nim
diff --git a/waku/waku_archive/driver/queue_driver/index.nim b/logos_delivery/waku/waku_archive/driver/queue_driver/index.nim
similarity index 100%
rename from waku/waku_archive/driver/queue_driver/index.nim
rename to logos_delivery/waku/waku_archive/driver/queue_driver/index.nim
diff --git a/waku/waku_archive/driver/queue_driver/queue_driver.nim b/logos_delivery/waku/waku_archive/driver/queue_driver/queue_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/queue_driver/queue_driver.nim
rename to logos_delivery/waku/waku_archive/driver/queue_driver/queue_driver.nim
diff --git a/waku/waku_archive/driver/sqlite_driver.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/sqlite_driver.nim
rename to logos_delivery/waku/waku_archive/driver/sqlite_driver.nim
diff --git a/waku/waku_archive/driver/sqlite_driver/migrations.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/migrations.nim
similarity index 100%
rename from waku/waku_archive/driver/sqlite_driver/migrations.nim
rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/migrations.nim
diff --git a/waku/waku_archive/driver/sqlite_driver/queries.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/queries.nim
similarity index 100%
rename from waku/waku_archive/driver/sqlite_driver/queries.nim
rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/queries.nim
diff --git a/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim b/logos_delivery/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim
similarity index 100%
rename from waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim
rename to logos_delivery/waku/waku_archive/driver/sqlite_driver/sqlite_driver.nim
diff --git a/waku/waku_archive/retention_policy.nim b/logos_delivery/waku/waku_archive/retention_policy.nim
similarity index 100%
rename from waku/waku_archive/retention_policy.nim
rename to logos_delivery/waku/waku_archive/retention_policy.nim
diff --git a/waku/waku_archive/retention_policy/builder.nim b/logos_delivery/waku/waku_archive/retention_policy/builder.nim
similarity index 100%
rename from waku/waku_archive/retention_policy/builder.nim
rename to logos_delivery/waku/waku_archive/retention_policy/builder.nim
diff --git a/waku/waku_archive/retention_policy/retention_policy_capacity.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_capacity.nim
similarity index 100%
rename from waku/waku_archive/retention_policy/retention_policy_capacity.nim
rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_capacity.nim
diff --git a/waku/waku_archive/retention_policy/retention_policy_size.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_size.nim
similarity index 100%
rename from waku/waku_archive/retention_policy/retention_policy_size.nim
rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_size.nim
diff --git a/waku/waku_archive/retention_policy/retention_policy_time.nim b/logos_delivery/waku/waku_archive/retention_policy/retention_policy_time.nim
similarity index 100%
rename from waku/waku_archive/retention_policy/retention_policy_time.nim
rename to logos_delivery/waku/waku_archive/retention_policy/retention_policy_time.nim
diff --git a/waku/waku_core.nim b/logos_delivery/waku/waku_core.nim
similarity index 100%
rename from waku/waku_core.nim
rename to logos_delivery/waku/waku_core.nim
diff --git a/waku/waku_core/codecs.nim b/logos_delivery/waku/waku_core/codecs.nim
similarity index 100%
rename from waku/waku_core/codecs.nim
rename to logos_delivery/waku/waku_core/codecs.nim
diff --git a/waku/waku_core/message.nim b/logos_delivery/waku/waku_core/message.nim
similarity index 100%
rename from waku/waku_core/message.nim
rename to logos_delivery/waku/waku_core/message.nim
diff --git a/waku/waku_core/message/codec.nim b/logos_delivery/waku/waku_core/message/codec.nim
similarity index 100%
rename from waku/waku_core/message/codec.nim
rename to logos_delivery/waku/waku_core/message/codec.nim
diff --git a/waku/waku_core/message/default_values.nim b/logos_delivery/waku/waku_core/message/default_values.nim
similarity index 100%
rename from waku/waku_core/message/default_values.nim
rename to logos_delivery/waku/waku_core/message/default_values.nim
diff --git a/waku/waku_core/message/digest.nim b/logos_delivery/waku/waku_core/message/digest.nim
similarity index 100%
rename from waku/waku_core/message/digest.nim
rename to logos_delivery/waku/waku_core/message/digest.nim
diff --git a/waku/waku_core/message/message.nim b/logos_delivery/waku/waku_core/message/message.nim
similarity index 100%
rename from waku/waku_core/message/message.nim
rename to logos_delivery/waku/waku_core/message/message.nim
diff --git a/waku/waku_core/multiaddrstr.nim b/logos_delivery/waku/waku_core/multiaddrstr.nim
similarity index 100%
rename from waku/waku_core/multiaddrstr.nim
rename to logos_delivery/waku/waku_core/multiaddrstr.nim
diff --git a/waku/waku_core/peers.nim b/logos_delivery/waku/waku_core/peers.nim
similarity index 100%
rename from waku/waku_core/peers.nim
rename to logos_delivery/waku/waku_core/peers.nim
diff --git a/waku/waku_core/subscription.nim b/logos_delivery/waku/waku_core/subscription.nim
similarity index 100%
rename from waku/waku_core/subscription.nim
rename to logos_delivery/waku/waku_core/subscription.nim
diff --git a/waku/waku_core/subscription/push_handler.nim b/logos_delivery/waku/waku_core/subscription/push_handler.nim
similarity index 100%
rename from waku/waku_core/subscription/push_handler.nim
rename to logos_delivery/waku/waku_core/subscription/push_handler.nim
diff --git a/waku/waku_core/time.nim b/logos_delivery/waku/waku_core/time.nim
similarity index 100%
rename from waku/waku_core/time.nim
rename to logos_delivery/waku/waku_core/time.nim
diff --git a/waku/waku_core/topics.nim b/logos_delivery/waku/waku_core/topics.nim
similarity index 100%
rename from waku/waku_core/topics.nim
rename to logos_delivery/waku/waku_core/topics.nim
diff --git a/waku/waku_core/topics/content_topic.nim b/logos_delivery/waku/waku_core/topics/content_topic.nim
similarity index 100%
rename from waku/waku_core/topics/content_topic.nim
rename to logos_delivery/waku/waku_core/topics/content_topic.nim
diff --git a/waku/waku_core/topics/parsing.nim b/logos_delivery/waku/waku_core/topics/parsing.nim
similarity index 100%
rename from waku/waku_core/topics/parsing.nim
rename to logos_delivery/waku/waku_core/topics/parsing.nim
diff --git a/waku/waku_core/topics/pubsub_topic.nim b/logos_delivery/waku/waku_core/topics/pubsub_topic.nim
similarity index 100%
rename from waku/waku_core/topics/pubsub_topic.nim
rename to logos_delivery/waku/waku_core/topics/pubsub_topic.nim
diff --git a/waku/waku_core/topics/sharding.nim b/logos_delivery/waku/waku_core/topics/sharding.nim
similarity index 100%
rename from waku/waku_core/topics/sharding.nim
rename to logos_delivery/waku/waku_core/topics/sharding.nim
diff --git a/waku/waku_enr.nim b/logos_delivery/waku/waku_enr.nim
similarity index 100%
rename from waku/waku_enr.nim
rename to logos_delivery/waku/waku_enr.nim
diff --git a/waku/waku_enr/capabilities.nim b/logos_delivery/waku/waku_enr/capabilities.nim
similarity index 100%
rename from waku/waku_enr/capabilities.nim
rename to logos_delivery/waku/waku_enr/capabilities.nim
diff --git a/waku/waku_enr/multiaddr.nim b/logos_delivery/waku/waku_enr/multiaddr.nim
similarity index 100%
rename from waku/waku_enr/multiaddr.nim
rename to logos_delivery/waku/waku_enr/multiaddr.nim
diff --git a/waku/waku_enr/sharding.nim b/logos_delivery/waku/waku_enr/sharding.nim
similarity index 100%
rename from waku/waku_enr/sharding.nim
rename to logos_delivery/waku/waku_enr/sharding.nim
diff --git a/waku/waku_filter_v2.nim b/logos_delivery/waku/waku_filter_v2.nim
similarity index 100%
rename from waku/waku_filter_v2.nim
rename to logos_delivery/waku/waku_filter_v2.nim
diff --git a/waku/waku_filter_v2/client.nim b/logos_delivery/waku/waku_filter_v2/client.nim
similarity index 100%
rename from waku/waku_filter_v2/client.nim
rename to logos_delivery/waku/waku_filter_v2/client.nim
diff --git a/waku/waku_filter_v2/common.nim b/logos_delivery/waku/waku_filter_v2/common.nim
similarity index 100%
rename from waku/waku_filter_v2/common.nim
rename to logos_delivery/waku/waku_filter_v2/common.nim
diff --git a/waku/waku_filter_v2/protocol.nim b/logos_delivery/waku/waku_filter_v2/protocol.nim
similarity index 100%
rename from waku/waku_filter_v2/protocol.nim
rename to logos_delivery/waku/waku_filter_v2/protocol.nim
diff --git a/waku/waku_filter_v2/protocol_metrics.nim b/logos_delivery/waku/waku_filter_v2/protocol_metrics.nim
similarity index 100%
rename from waku/waku_filter_v2/protocol_metrics.nim
rename to logos_delivery/waku/waku_filter_v2/protocol_metrics.nim
diff --git a/waku/waku_filter_v2/rpc.nim b/logos_delivery/waku/waku_filter_v2/rpc.nim
similarity index 100%
rename from waku/waku_filter_v2/rpc.nim
rename to logos_delivery/waku/waku_filter_v2/rpc.nim
diff --git a/waku/waku_filter_v2/rpc_codec.nim b/logos_delivery/waku/waku_filter_v2/rpc_codec.nim
similarity index 100%
rename from waku/waku_filter_v2/rpc_codec.nim
rename to logos_delivery/waku/waku_filter_v2/rpc_codec.nim
diff --git a/waku/waku_filter_v2/subscriptions.nim b/logos_delivery/waku/waku_filter_v2/subscriptions.nim
similarity index 100%
rename from waku/waku_filter_v2/subscriptions.nim
rename to logos_delivery/waku/waku_filter_v2/subscriptions.nim
diff --git a/waku/waku_keystore.nim b/logos_delivery/waku/waku_keystore.nim
similarity index 100%
rename from waku/waku_keystore.nim
rename to logos_delivery/waku/waku_keystore.nim
diff --git a/waku/waku_keystore/conversion_utils.nim b/logos_delivery/waku/waku_keystore/conversion_utils.nim
similarity index 100%
rename from waku/waku_keystore/conversion_utils.nim
rename to logos_delivery/waku/waku_keystore/conversion_utils.nim
diff --git a/waku/waku_keystore/keyfile.nim b/logos_delivery/waku/waku_keystore/keyfile.nim
similarity index 100%
rename from waku/waku_keystore/keyfile.nim
rename to logos_delivery/waku/waku_keystore/keyfile.nim
diff --git a/waku/waku_keystore/keystore.nim b/logos_delivery/waku/waku_keystore/keystore.nim
similarity index 100%
rename from waku/waku_keystore/keystore.nim
rename to logos_delivery/waku/waku_keystore/keystore.nim
diff --git a/waku/waku_keystore/protocol_types.nim b/logos_delivery/waku/waku_keystore/protocol_types.nim
similarity index 100%
rename from waku/waku_keystore/protocol_types.nim
rename to logos_delivery/waku/waku_keystore/protocol_types.nim
diff --git a/waku/waku_keystore/utils.nim b/logos_delivery/waku/waku_keystore/utils.nim
similarity index 100%
rename from waku/waku_keystore/utils.nim
rename to logos_delivery/waku/waku_keystore/utils.nim
diff --git a/waku/waku_lightpush.nim b/logos_delivery/waku/waku_lightpush.nim
similarity index 100%
rename from waku/waku_lightpush.nim
rename to logos_delivery/waku/waku_lightpush.nim
diff --git a/waku/waku_lightpush/callbacks.nim b/logos_delivery/waku/waku_lightpush/callbacks.nim
similarity index 100%
rename from waku/waku_lightpush/callbacks.nim
rename to logos_delivery/waku/waku_lightpush/callbacks.nim
diff --git a/waku/waku_lightpush/client.nim b/logos_delivery/waku/waku_lightpush/client.nim
similarity index 100%
rename from waku/waku_lightpush/client.nim
rename to logos_delivery/waku/waku_lightpush/client.nim
diff --git a/waku/waku_lightpush/common.nim b/logos_delivery/waku/waku_lightpush/common.nim
similarity index 100%
rename from waku/waku_lightpush/common.nim
rename to logos_delivery/waku/waku_lightpush/common.nim
diff --git a/waku/waku_lightpush/protocol.nim b/logos_delivery/waku/waku_lightpush/protocol.nim
similarity index 100%
rename from waku/waku_lightpush/protocol.nim
rename to logos_delivery/waku/waku_lightpush/protocol.nim
diff --git a/waku/waku_lightpush/protocol_metrics.nim b/logos_delivery/waku/waku_lightpush/protocol_metrics.nim
similarity index 100%
rename from waku/waku_lightpush/protocol_metrics.nim
rename to logos_delivery/waku/waku_lightpush/protocol_metrics.nim
diff --git a/waku/waku_lightpush/rpc.nim b/logos_delivery/waku/waku_lightpush/rpc.nim
similarity index 100%
rename from waku/waku_lightpush/rpc.nim
rename to logos_delivery/waku/waku_lightpush/rpc.nim
diff --git a/waku/waku_lightpush/rpc_codec.nim b/logos_delivery/waku/waku_lightpush/rpc_codec.nim
similarity index 100%
rename from waku/waku_lightpush/rpc_codec.nim
rename to logos_delivery/waku/waku_lightpush/rpc_codec.nim
diff --git a/waku/waku_lightpush/self_req_handler.nim b/logos_delivery/waku/waku_lightpush/self_req_handler.nim
similarity index 100%
rename from waku/waku_lightpush/self_req_handler.nim
rename to logos_delivery/waku/waku_lightpush/self_req_handler.nim
diff --git a/waku/waku_lightpush_legacy.nim b/logos_delivery/waku/waku_lightpush_legacy.nim
similarity index 100%
rename from waku/waku_lightpush_legacy.nim
rename to logos_delivery/waku/waku_lightpush_legacy.nim
diff --git a/waku/waku_lightpush_legacy/README.md b/logos_delivery/waku/waku_lightpush_legacy/README.md
similarity index 100%
rename from waku/waku_lightpush_legacy/README.md
rename to logos_delivery/waku/waku_lightpush_legacy/README.md
diff --git a/waku/waku_lightpush_legacy/callbacks.nim b/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/callbacks.nim
rename to logos_delivery/waku/waku_lightpush_legacy/callbacks.nim
diff --git a/waku/waku_lightpush_legacy/client.nim b/logos_delivery/waku/waku_lightpush_legacy/client.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/client.nim
rename to logos_delivery/waku/waku_lightpush_legacy/client.nim
diff --git a/waku/waku_lightpush_legacy/common.nim b/logos_delivery/waku/waku_lightpush_legacy/common.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/common.nim
rename to logos_delivery/waku/waku_lightpush_legacy/common.nim
diff --git a/waku/waku_lightpush_legacy/protocol.nim b/logos_delivery/waku/waku_lightpush_legacy/protocol.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/protocol.nim
rename to logos_delivery/waku/waku_lightpush_legacy/protocol.nim
diff --git a/waku/waku_lightpush_legacy/protocol_metrics.nim b/logos_delivery/waku/waku_lightpush_legacy/protocol_metrics.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/protocol_metrics.nim
rename to logos_delivery/waku/waku_lightpush_legacy/protocol_metrics.nim
diff --git a/waku/waku_lightpush_legacy/rpc.nim b/logos_delivery/waku/waku_lightpush_legacy/rpc.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/rpc.nim
rename to logos_delivery/waku/waku_lightpush_legacy/rpc.nim
diff --git a/waku/waku_lightpush_legacy/rpc_codec.nim b/logos_delivery/waku/waku_lightpush_legacy/rpc_codec.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/rpc_codec.nim
rename to logos_delivery/waku/waku_lightpush_legacy/rpc_codec.nim
diff --git a/waku/waku_lightpush_legacy/self_req_handler.nim b/logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim
similarity index 100%
rename from waku/waku_lightpush_legacy/self_req_handler.nim
rename to logos_delivery/waku/waku_lightpush_legacy/self_req_handler.nim
diff --git a/waku/waku_metadata.nim b/logos_delivery/waku/waku_metadata.nim
similarity index 100%
rename from waku/waku_metadata.nim
rename to logos_delivery/waku/waku_metadata.nim
diff --git a/waku/waku_metadata/protocol.nim b/logos_delivery/waku/waku_metadata/protocol.nim
similarity index 100%
rename from waku/waku_metadata/protocol.nim
rename to logos_delivery/waku/waku_metadata/protocol.nim
diff --git a/waku/waku_metadata/rpc.nim b/logos_delivery/waku/waku_metadata/rpc.nim
similarity index 100%
rename from waku/waku_metadata/rpc.nim
rename to logos_delivery/waku/waku_metadata/rpc.nim
diff --git a/waku/waku_mix.nim b/logos_delivery/waku/waku_mix.nim
similarity index 100%
rename from waku/waku_mix.nim
rename to logos_delivery/waku/waku_mix.nim
diff --git a/waku/waku_mix/protocol.nim b/logos_delivery/waku/waku_mix/protocol.nim
similarity index 100%
rename from waku/waku_mix/protocol.nim
rename to logos_delivery/waku/waku_mix/protocol.nim
diff --git a/waku/waku_node.nim b/logos_delivery/waku/waku_node.nim
similarity index 100%
rename from waku/waku_node.nim
rename to logos_delivery/waku/waku_node.nim
diff --git a/waku/waku_noise/noise.nim b/logos_delivery/waku/waku_noise/noise.nim
similarity index 100%
rename from waku/waku_noise/noise.nim
rename to logos_delivery/waku/waku_noise/noise.nim
diff --git a/waku/waku_noise/noise_handshake_processing.nim b/logos_delivery/waku/waku_noise/noise_handshake_processing.nim
similarity index 100%
rename from waku/waku_noise/noise_handshake_processing.nim
rename to logos_delivery/waku/waku_noise/noise_handshake_processing.nim
diff --git a/waku/waku_noise/noise_types.nim b/logos_delivery/waku/waku_noise/noise_types.nim
similarity index 100%
rename from waku/waku_noise/noise_types.nim
rename to logos_delivery/waku/waku_noise/noise_types.nim
diff --git a/waku/waku_noise/noise_utils.nim b/logos_delivery/waku/waku_noise/noise_utils.nim
similarity index 100%
rename from waku/waku_noise/noise_utils.nim
rename to logos_delivery/waku/waku_noise/noise_utils.nim
diff --git a/waku/waku_peer_exchange.nim b/logos_delivery/waku/waku_peer_exchange.nim
similarity index 100%
rename from waku/waku_peer_exchange.nim
rename to logos_delivery/waku/waku_peer_exchange.nim
diff --git a/waku/waku_peer_exchange/README.md b/logos_delivery/waku/waku_peer_exchange/README.md
similarity index 100%
rename from waku/waku_peer_exchange/README.md
rename to logos_delivery/waku/waku_peer_exchange/README.md
diff --git a/waku/waku_peer_exchange/client.nim b/logos_delivery/waku/waku_peer_exchange/client.nim
similarity index 100%
rename from waku/waku_peer_exchange/client.nim
rename to logos_delivery/waku/waku_peer_exchange/client.nim
diff --git a/waku/waku_peer_exchange/common.nim b/logos_delivery/waku/waku_peer_exchange/common.nim
similarity index 100%
rename from waku/waku_peer_exchange/common.nim
rename to logos_delivery/waku/waku_peer_exchange/common.nim
diff --git a/waku/waku_peer_exchange/protocol.nim b/logos_delivery/waku/waku_peer_exchange/protocol.nim
similarity index 100%
rename from waku/waku_peer_exchange/protocol.nim
rename to logos_delivery/waku/waku_peer_exchange/protocol.nim
diff --git a/waku/waku_peer_exchange/rpc.nim b/logos_delivery/waku/waku_peer_exchange/rpc.nim
similarity index 100%
rename from waku/waku_peer_exchange/rpc.nim
rename to logos_delivery/waku/waku_peer_exchange/rpc.nim
diff --git a/waku/waku_peer_exchange/rpc_codec.nim b/logos_delivery/waku/waku_peer_exchange/rpc_codec.nim
similarity index 100%
rename from waku/waku_peer_exchange/rpc_codec.nim
rename to logos_delivery/waku/waku_peer_exchange/rpc_codec.nim
diff --git a/waku/waku_persistency.nim b/logos_delivery/waku/waku_persistency.nim
similarity index 100%
rename from waku/waku_persistency.nim
rename to logos_delivery/waku/waku_persistency.nim
diff --git a/waku/waku_relay.nim b/logos_delivery/waku/waku_relay.nim
similarity index 100%
rename from waku/waku_relay.nim
rename to logos_delivery/waku/waku_relay.nim
diff --git a/waku/waku_relay/message_id.nim b/logos_delivery/waku/waku_relay/message_id.nim
similarity index 100%
rename from waku/waku_relay/message_id.nim
rename to logos_delivery/waku/waku_relay/message_id.nim
diff --git a/waku/waku_relay/protocol.nim b/logos_delivery/waku/waku_relay/protocol.nim
similarity index 100%
rename from waku/waku_relay/protocol.nim
rename to logos_delivery/waku/waku_relay/protocol.nim
diff --git a/waku/waku_rendezvous.nim b/logos_delivery/waku/waku_rendezvous.nim
similarity index 100%
rename from waku/waku_rendezvous.nim
rename to logos_delivery/waku/waku_rendezvous.nim
diff --git a/waku/waku_rendezvous/client.nim b/logos_delivery/waku/waku_rendezvous/client.nim
similarity index 100%
rename from waku/waku_rendezvous/client.nim
rename to logos_delivery/waku/waku_rendezvous/client.nim
diff --git a/waku/waku_rendezvous/common.nim b/logos_delivery/waku/waku_rendezvous/common.nim
similarity index 100%
rename from waku/waku_rendezvous/common.nim
rename to logos_delivery/waku/waku_rendezvous/common.nim
diff --git a/waku/waku_rendezvous/protocol.nim b/logos_delivery/waku/waku_rendezvous/protocol.nim
similarity index 100%
rename from waku/waku_rendezvous/protocol.nim
rename to logos_delivery/waku/waku_rendezvous/protocol.nim
diff --git a/waku/waku_rendezvous/waku_peer_record.nim b/logos_delivery/waku/waku_rendezvous/waku_peer_record.nim
similarity index 100%
rename from waku/waku_rendezvous/waku_peer_record.nim
rename to logos_delivery/waku/waku_rendezvous/waku_peer_record.nim
diff --git a/waku/waku_rest.nim b/logos_delivery/waku/waku_rest.nim
similarity index 100%
rename from waku/waku_rest.nim
rename to logos_delivery/waku/waku_rest.nim
diff --git a/waku/waku_rln_relay.nim b/logos_delivery/waku/waku_rln_relay.nim
similarity index 100%
rename from waku/waku_rln_relay.nim
rename to logos_delivery/waku/waku_rln_relay.nim
diff --git a/waku/waku_rln_relay/constants.nim b/logos_delivery/waku/waku_rln_relay/constants.nim
similarity index 100%
rename from waku/waku_rln_relay/constants.nim
rename to logos_delivery/waku/waku_rln_relay/constants.nim
diff --git a/waku/waku_rln_relay/contract.nim b/logos_delivery/waku/waku_rln_relay/contract.nim
similarity index 100%
rename from waku/waku_rln_relay/contract.nim
rename to logos_delivery/waku/waku_rln_relay/contract.nim
diff --git a/waku/waku_rln_relay/conversion_utils.nim b/logos_delivery/waku/waku_rln_relay/conversion_utils.nim
similarity index 100%
rename from waku/waku_rln_relay/conversion_utils.nim
rename to logos_delivery/waku/waku_rln_relay/conversion_utils.nim
diff --git a/waku/waku_rln_relay/group_manager.nim b/logos_delivery/waku/waku_rln_relay/group_manager.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager.nim
diff --git a/waku/waku_rln_relay/group_manager/group_manager_base.nim b/logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager/group_manager_base.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim
diff --git a/waku/waku_rln_relay/group_manager/on_chain.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager/on_chain.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim
diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
diff --git a/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim
diff --git a/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim b/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim
similarity index 100%
rename from waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim
rename to logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim
diff --git a/waku/waku_rln_relay/nonce_manager.nim b/logos_delivery/waku/waku_rln_relay/nonce_manager.nim
similarity index 100%
rename from waku/waku_rln_relay/nonce_manager.nim
rename to logos_delivery/waku/waku_rln_relay/nonce_manager.nim
diff --git a/waku/waku_rln_relay/protocol_metrics.nim b/logos_delivery/waku/waku_rln_relay/protocol_metrics.nim
similarity index 100%
rename from waku/waku_rln_relay/protocol_metrics.nim
rename to logos_delivery/waku/waku_rln_relay/protocol_metrics.nim
diff --git a/waku/waku_rln_relay/protocol_types.nim b/logos_delivery/waku/waku_rln_relay/protocol_types.nim
similarity index 100%
rename from waku/waku_rln_relay/protocol_types.nim
rename to logos_delivery/waku/waku_rln_relay/protocol_types.nim
diff --git a/waku/waku_rln_relay/rln.nim b/logos_delivery/waku/waku_rln_relay/rln.nim
similarity index 100%
rename from waku/waku_rln_relay/rln.nim
rename to logos_delivery/waku/waku_rln_relay/rln.nim
diff --git a/waku/waku_rln_relay/rln/rln_interface.nim b/logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim
similarity index 100%
rename from waku/waku_rln_relay/rln/rln_interface.nim
rename to logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim
diff --git a/waku/waku_rln_relay/rln/wrappers.nim b/logos_delivery/waku/waku_rln_relay/rln/wrappers.nim
similarity index 100%
rename from waku/waku_rln_relay/rln/wrappers.nim
rename to logos_delivery/waku/waku_rln_relay/rln/wrappers.nim
diff --git a/waku/waku_rln_relay/rln_relay.nim b/logos_delivery/waku/waku_rln_relay/rln_relay.nim
similarity index 100%
rename from waku/waku_rln_relay/rln_relay.nim
rename to logos_delivery/waku/waku_rln_relay/rln_relay.nim
diff --git a/waku/waku_store.nim b/logos_delivery/waku/waku_store.nim
similarity index 100%
rename from waku/waku_store.nim
rename to logos_delivery/waku/waku_store.nim
diff --git a/waku/waku_store/client.nim b/logos_delivery/waku/waku_store/client.nim
similarity index 100%
rename from waku/waku_store/client.nim
rename to logos_delivery/waku/waku_store/client.nim
diff --git a/waku/waku_store/common.nim b/logos_delivery/waku/waku_store/common.nim
similarity index 100%
rename from waku/waku_store/common.nim
rename to logos_delivery/waku/waku_store/common.nim
diff --git a/waku/waku_store/protocol.nim b/logos_delivery/waku/waku_store/protocol.nim
similarity index 100%
rename from waku/waku_store/protocol.nim
rename to logos_delivery/waku/waku_store/protocol.nim
diff --git a/waku/waku_store/protocol_metrics.nim b/logos_delivery/waku/waku_store/protocol_metrics.nim
similarity index 100%
rename from waku/waku_store/protocol_metrics.nim
rename to logos_delivery/waku/waku_store/protocol_metrics.nim
diff --git a/waku/waku_store/resume.nim b/logos_delivery/waku/waku_store/resume.nim
similarity index 100%
rename from waku/waku_store/resume.nim
rename to logos_delivery/waku/waku_store/resume.nim
diff --git a/waku/waku_store/rpc_codec.nim b/logos_delivery/waku/waku_store/rpc_codec.nim
similarity index 100%
rename from waku/waku_store/rpc_codec.nim
rename to logos_delivery/waku/waku_store/rpc_codec.nim
diff --git a/waku/waku_store/self_req_handler.nim b/logos_delivery/waku/waku_store/self_req_handler.nim
similarity index 100%
rename from waku/waku_store/self_req_handler.nim
rename to logos_delivery/waku/waku_store/self_req_handler.nim
diff --git a/waku/waku_store_sync.nim b/logos_delivery/waku/waku_store_sync.nim
similarity index 100%
rename from waku/waku_store_sync.nim
rename to logos_delivery/waku/waku_store_sync.nim
diff --git a/waku/waku_store_sync/codec.nim b/logos_delivery/waku/waku_store_sync/codec.nim
similarity index 100%
rename from waku/waku_store_sync/codec.nim
rename to logos_delivery/waku/waku_store_sync/codec.nim
diff --git a/waku/waku_store_sync/common.nim b/logos_delivery/waku/waku_store_sync/common.nim
similarity index 100%
rename from waku/waku_store_sync/common.nim
rename to logos_delivery/waku/waku_store_sync/common.nim
diff --git a/waku/waku_store_sync/protocols_metrics.nim b/logos_delivery/waku/waku_store_sync/protocols_metrics.nim
similarity index 100%
rename from waku/waku_store_sync/protocols_metrics.nim
rename to logos_delivery/waku/waku_store_sync/protocols_metrics.nim
diff --git a/waku/waku_store_sync/reconciliation.nim b/logos_delivery/waku/waku_store_sync/reconciliation.nim
similarity index 100%
rename from waku/waku_store_sync/reconciliation.nim
rename to logos_delivery/waku/waku_store_sync/reconciliation.nim
diff --git a/waku/waku_store_sync/storage/range_processing.nim b/logos_delivery/waku/waku_store_sync/storage/range_processing.nim
similarity index 100%
rename from waku/waku_store_sync/storage/range_processing.nim
rename to logos_delivery/waku/waku_store_sync/storage/range_processing.nim
diff --git a/waku/waku_store_sync/storage/seq_storage.nim b/logos_delivery/waku/waku_store_sync/storage/seq_storage.nim
similarity index 100%
rename from waku/waku_store_sync/storage/seq_storage.nim
rename to logos_delivery/waku/waku_store_sync/storage/seq_storage.nim
diff --git a/waku/waku_store_sync/storage/storage.nim b/logos_delivery/waku/waku_store_sync/storage/storage.nim
similarity index 100%
rename from waku/waku_store_sync/storage/storage.nim
rename to logos_delivery/waku/waku_store_sync/storage/storage.nim
diff --git a/waku/waku_store_sync/transfer.nim b/logos_delivery/waku/waku_store_sync/transfer.nim
similarity index 100%
rename from waku/waku_store_sync/transfer.nim
rename to logos_delivery/waku/waku_store_sync/transfer.nim
diff --git a/tools/sync-nimble-lock.sh b/tools/sync-nimble-lock.sh
index b55826327..29d30afb2 100755
--- a/tools/sync-nimble-lock.sh
+++ b/tools/sync-nimble-lock.sh
@@ -2,7 +2,7 @@
 #
 # sync-nimble-lock.sh
 #
-# Cross-check git-URL pinned `requires` in waku.nimble against nimble.lock and
+# Cross-check git-URL pinned `requires` in logos_delivery.nimble against nimble.lock and
 # sync the lock entry for any pin that CHANGED relative to a git base ref
 # (default: HEAD) -- and ONLY those entries. No other package is touched.
 #
@@ -19,7 +19,7 @@
 #
 # For each changed pin it updates exactly three fields of the matching lock
 # entry, preserving all formatting and every other entry byte-for-byte:
-#   version      = "#" + <rev-as-written-in-waku.nimble>   (commit or tag)
+#   version      = "#" + <rev-as-written-in-logos_delivery.nimble>   (commit or tag)
 #   vcsRevision  = git rev-parse of the ref                 (resolves tags)
 #   checksums.sha1 = the self-computed checksum
 #
@@ -82,7 +82,7 @@ APPLY = os.environ["SYNC_APPLY"] == "1"
 BASE = os.environ["SYNC_BASE"]
 PKGCACHE = os.environ["SYNC_PKGCACHE"]
 
-NIMBLE_FILE = os.path.join(ROOT, "waku.nimble")
+NIMBLE_FILE = os.path.join(ROOT, "logos_delivery.nimble")
 LOCK_FILE = os.path.join(ROOT, "nimble.lock")
 
 REQ_RE = re.compile(r'requires\s+"(https?://[^"#]+)#([^"]+)"')
@@ -180,7 +180,7 @@ def dep_requires_count(checkout_dir):
 # detect changes
 # ---------------------------------------------------------------------------
 def parse_changed(base):
-    r = git(["-C", ROOT, "diff", base, "--", "waku.nimble"], check=False)
+    r = git(["-C", ROOT, "diff", base, "--", "logos_delivery.nimble"], check=False)
     if r.returncode != 0:
         fail("git diff against %r failed: %s" % (base, r.stderr.strip()))
     changed, seen = [], set()
@@ -245,7 +245,7 @@ def main():
 
     changed = parse_changed(BASE)
     if not changed:
-        print("No changed git-URL `requires` in waku.nimble vs %s — nothing to sync." % BASE)
+        print("No changed git-URL `requires` in logos_delivery.nimble vs %s — nothing to sync." % BASE)
         return 0
 
     lock = json.load(open(LOCK_FILE))
@@ -264,13 +264,13 @@ def main():
             drift.append((url, rev, hit[0], hit[1].get("version")))
 
     if not drift:
-        print("nimble.lock already in sync with waku.nimble (%d changed pin(s) checked)." % len(changed))
+        print("nimble.lock already in sync with logos_delivery.nimble (%d changed pin(s) checked)." % len(changed))
         return 0
 
-    print("Dependency drift (waku.nimble vs nimble.lock):")
+    print("Dependency drift (logos_delivery.nimble vs nimble.lock):")
     for url, rev, name, cur in drift:
         tag = name or "(missing)"
-        print("  ~ %s [%s]\n      waku.nimble: #%s\n      nimble.lock: %s" % (url, tag, rev, cur))
+        print("  ~ %s [%s]\n      logos_delivery.nimble: #%s\n      nimble.lock: %s" % (url, tag, rev, cur))
 
     if not APPLY:
         print("\nRun with --apply to update nimble.lock (computes checksum itself; no `nimble lock`).")
diff --git a/vendor/zerokit b/vendor/zerokit
index 5e64cb882..a4bb3feb5 160000
--- a/vendor/zerokit
+++ b/vendor/zerokit
@@ -1 +1 @@
-Subproject commit 5e64cb8822bee65eed6cf459f95ae72b80c6ba63
+Subproject commit a4bb3feb5054e6fd24827adf204493e6e173437b