diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a199336485..e44f1740d7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -374,13 +374,13 @@ jobs:
       - name: "Run wrapper integration tests"
         run: (cd wrappers/node && npm run test:integration)
       - name: "Install vcxagent-core dependencies"
-        run: (cd agents/node/vcxagent-core && npm install)
+        run: (cd aries/agents/node/vcxagent-core && npm install)
       - name: "Run demo"
-        run: (cd agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run demo)
+        run: (cd aries/agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run demo)
       - name: "Run demo with revocation"
-        run: (cd agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run demo:revocation)
+        run: (cd aries/agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run demo:revocation)
       - name: "Run integration tests"
-        run: (cd agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run test:integration)
+        run: (cd aries/agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run test:integration)
 
 
 
@@ -431,7 +431,7 @@ jobs:
         run: |
           if [[ "$PUBLISH_VERSION" ]]
           then
-            NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./agents/node/vcxagent-core/publish.sh
+            NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./aries/agents/node/vcxagent-core/publish.sh
           else
              echo "New version was not defined, skipping release."
           fi
diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml
index e93633ea6d..e383c94023 100644
--- a/.github/workflows/mediator.pr.yml
+++ b/.github/workflows/mediator.pr.yml
@@ -8,7 +8,7 @@ on:
     branches:
       - "**"
     paths:
-      - 'agents/rust/mediator/**'
+      - 'aries/agents/rust/mediator/**'
 
 env:
   DOCKER_BUILDKIT: 1
@@ -51,6 +51,6 @@ jobs:
         # uses: Swatinem/rust-cache@v2
         run: cargo install sqlx-cli
       - name: Setup database
-        run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source agents/rust/mediator/mediation/migrations
+        run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source aries/agents/rust/mediator/mediation/migrations
       - name: "Run mediator integration tests"
         run: cargo run --bin mediator & sleep 5 && cargo test --verbose --package mediator -- --nocapture;
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index b99e8e14d6..42ed3c5256 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,8 +10,8 @@ members = [
     "messages",
     "shared_vcx",
     "diddoc_legacy",
-    "agents/rust/mediator",
-    "agents/rust/mediator/client-tui",
+    "aries/agents/rust/mediator",
+    "aries/agents/rust/mediator/client-tui",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",
     "aries_vcx_core",
@@ -31,12 +31,15 @@ members = [
     "tools/simple_message_relay",
     "tools/test_utils",
     "tools/libvcx_logger",
-    "tools/display_as_json"
+    "tools/display_as_json",
 ]
 
 [workspace.package]
 version = "0.61.0"
-authors = ["Absa Group Limited", "Hyperledger Indy Contributors <hyperledger-indy@lists.hyperledger.org>"]
+authors = [
+    "Absa Group Limited",
+    "Hyperledger Indy Contributors <hyperledger-indy@lists.hyperledger.org>",
+]
 description = "Library to work with Aries protocols & collection of supporting components"
 license = "Apache-2.0"
 edition = "2021"
@@ -72,5 +75,3 @@ unused_import_braces = "warn"
 unused_lifetimes = "warn"
 unused_qualifications = "warn"
 let_underscore_drop = "allow"
-
-
diff --git a/agents/rust/README.md b/agents/rust/README.md
index 20188f7543..eb2d1ff2f1 100644
--- a/agents/rust/README.md
+++ b/agents/rust/README.md
@@ -1,4 +1,5 @@
 # Rust agents
+
 This directory contains some of Rust agents built on top of the `aries_vcx` crate:
-- `aries-vcx-agent` - aries agent library providing used to build our cross-framework testing [backchannel](https://github.com/hyperledger/aries-agent-test-harness/tree/main/aries-backchannels/aries-vcx)
 
+- `aries-vcx-agent` - aries agent library providing used to build our cross-framework testing [backchannel](https://github.com/hyperledger/aries-agent-test-harness/tree/main/aries-backchannels/aries-vcx)
diff --git a/agents/rust/aries-vcx-agent/Cargo.toml b/agents/rust/aries-vcx-agent/Cargo.toml
index 4c9e710cc9..f43bfe2a8f 100644
--- a/agents/rust/aries-vcx-agent/Cargo.toml
+++ b/agents/rust/aries-vcx-agent/Cargo.toml
@@ -8,7 +8,10 @@ edition.workspace = true
 [dependencies]
 serde = "1.0.145"
 aries_vcx = { path = "../../../aries_vcx" }
-aries_vcx_core = { path = "../../../aries_vcx_core", features = ["credx", "vdrtools_wallet"] }
+aries_vcx_core = { path = "../../../aries_vcx_core", features = [
+    "credx",
+    "vdrtools_wallet",
+] }
 shared_vcx = { path = "../../../shared_vcx" }
 async-trait = "0.1.64"
 derive_builder = "0.12.0"
diff --git a/agents/node/.gitignore b/aries/agents/node/.gitignore
similarity index 100%
rename from agents/node/.gitignore
rename to aries/agents/node/.gitignore
diff --git a/agents/node/vcxagent-cli/logger.js b/aries/agents/node/vcxagent-cli/logger.js
similarity index 100%
rename from agents/node/vcxagent-cli/logger.js
rename to aries/agents/node/vcxagent-cli/logger.js
diff --git a/agents/node/vcxagent-cli/package.json b/aries/agents/node/vcxagent-cli/package.json
similarity index 89%
rename from agents/node/vcxagent-cli/package.json
rename to aries/agents/node/vcxagent-cli/package.json
index 81ae9c2e8f..ea285be0cc 100644
--- a/agents/node/vcxagent-cli/package.json
+++ b/aries/agents/node/vcxagent-cli/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "sovrin-networks": "git+https://github.com/AbsaOSS/sovrin-networks#0.1.0",
-    "@hyperledger/node-vcx-wrapper": "file:../../../wrappers/node",
+    "@hyperledger/node-vcx-wrapper": "file:../../../../wrappers/node",
     "@hyperledger/vcxagent-core": "file:../vcxagent-core",
     "command-line-args": "^5.1.1",
     "command-line-usage": "^5.0.5",
@@ -20,4 +20,4 @@
   },
   "author": "Absa Group Limited",
   "license": "Apache-2.0"
-}
+}
\ No newline at end of file
diff --git a/agents/node/vcxagent-cli/readme.md b/aries/agents/node/vcxagent-cli/readme.md
similarity index 100%
rename from agents/node/vcxagent-cli/readme.md
rename to aries/agents/node/vcxagent-cli/readme.md
diff --git a/agents/node/vcxagent-cli/script-common.js b/aries/agents/node/vcxagent-cli/script-common.js
similarity index 100%
rename from agents/node/vcxagent-cli/script-common.js
rename to aries/agents/node/vcxagent-cli/script-common.js
diff --git a/agents/node/vcxagent-cli/vcxclient-cli.js b/aries/agents/node/vcxagent-cli/vcxclient-cli.js
similarity index 100%
rename from agents/node/vcxagent-cli/vcxclient-cli.js
rename to aries/agents/node/vcxagent-cli/vcxclient-cli.js
diff --git a/agents/node/vcxagent-cli/vcxclient-interactive.js b/aries/agents/node/vcxagent-cli/vcxclient-interactive.js
similarity index 100%
rename from agents/node/vcxagent-cli/vcxclient-interactive.js
rename to aries/agents/node/vcxagent-cli/vcxclient-interactive.js
diff --git a/agents/node/vcxagent-core/demo/alice.js b/aries/agents/node/vcxagent-core/demo/alice.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/alice.js
rename to aries/agents/node/vcxagent-core/demo/alice.js
diff --git a/agents/node/vcxagent-core/demo/faber.js b/aries/agents/node/vcxagent-core/demo/faber.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/faber.js
rename to aries/agents/node/vcxagent-core/demo/faber.js
diff --git a/agents/node/vcxagent-core/demo/integration-test.js b/aries/agents/node/vcxagent-core/demo/integration-test.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/integration-test.js
rename to aries/agents/node/vcxagent-core/demo/integration-test.js
diff --git a/agents/node/vcxagent-core/demo/logger.js b/aries/agents/node/vcxagent-core/demo/logger.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/logger.js
rename to aries/agents/node/vcxagent-core/demo/logger.js
diff --git a/agents/node/vcxagent-core/demo/notification-server.js b/aries/agents/node/vcxagent-core/demo/notification-server.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/notification-server.js
rename to aries/agents/node/vcxagent-core/demo/notification-server.js
diff --git a/agents/node/vcxagent-core/demo/script-common.js b/aries/agents/node/vcxagent-core/demo/script-common.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/script-common.js
rename to aries/agents/node/vcxagent-core/demo/script-common.js
diff --git a/agents/node/vcxagent-core/demo/wallet-common.js b/aries/agents/node/vcxagent-core/demo/wallet-common.js
similarity index 100%
rename from agents/node/vcxagent-core/demo/wallet-common.js
rename to aries/agents/node/vcxagent-core/demo/wallet-common.js
diff --git a/agents/node/vcxagent-core/package.json b/aries/agents/node/vcxagent-core/package.json
similarity index 97%
rename from agents/node/vcxagent-core/package.json
rename to aries/agents/node/vcxagent-core/package.json
index d16bac541e..537b956d52 100644
--- a/agents/node/vcxagent-core/package.json
+++ b/aries/agents/node/vcxagent-core/package.json
@@ -47,7 +47,7 @@
     "test:integration:connection": "jest --forceExit --env=node --runInBand test/connection.spec.js"
   },
   "dependencies": {
-    "@hyperledger/node-vcx-wrapper": "file:../../../wrappers/node",
+    "@hyperledger/node-vcx-wrapper": "file:../../../../wrappers/node",
     "axios": "^1.6.0",
     "ffi-napi": "^4.0.3",
     "fs-extra": "^4.0.3",
@@ -68,4 +68,4 @@
     "standard": "^16.0.4",
     "winston": "^3.3.3"
   }
-}
+}
\ No newline at end of file
diff --git a/agents/node/vcxagent-core/publish.sh b/aries/agents/node/vcxagent-core/publish.sh
similarity index 100%
rename from agents/node/vcxagent-core/publish.sh
rename to aries/agents/node/vcxagent-core/publish.sh
diff --git a/agents/node/vcxagent-core/readme.md b/aries/agents/node/vcxagent-core/readme.md
similarity index 100%
rename from agents/node/vcxagent-core/readme.md
rename to aries/agents/node/vcxagent-core/readme.md
diff --git a/agents/node/vcxagent-core/resources/docker.txn b/aries/agents/node/vcxagent-core/resources/docker.txn
similarity index 100%
rename from agents/node/vcxagent-core/resources/docker.txn
rename to aries/agents/node/vcxagent-core/resources/docker.txn
diff --git a/agents/node/vcxagent-core/src/agent.js b/aries/agents/node/vcxagent-core/src/agent.js
similarity index 100%
rename from agents/node/vcxagent-core/src/agent.js
rename to aries/agents/node/vcxagent-core/src/agent.js
diff --git a/agents/node/vcxagent-core/src/common.js b/aries/agents/node/vcxagent-core/src/common.js
similarity index 100%
rename from agents/node/vcxagent-core/src/common.js
rename to aries/agents/node/vcxagent-core/src/common.js
diff --git a/agents/node/vcxagent-core/src/index.js b/aries/agents/node/vcxagent-core/src/index.js
similarity index 100%
rename from agents/node/vcxagent-core/src/index.js
rename to aries/agents/node/vcxagent-core/src/index.js
diff --git a/agents/node/vcxagent-core/src/services/service-connections.js b/aries/agents/node/vcxagent-core/src/services/service-connections.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-connections.js
rename to aries/agents/node/vcxagent-core/src/services/service-connections.js
diff --git a/agents/node/vcxagent-core/src/services/service-cred-holder.js b/aries/agents/node/vcxagent-core/src/services/service-cred-holder.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-cred-holder.js
rename to aries/agents/node/vcxagent-core/src/services/service-cred-holder.js
diff --git a/agents/node/vcxagent-core/src/services/service-cred-issuer.js b/aries/agents/node/vcxagent-core/src/services/service-cred-issuer.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-cred-issuer.js
rename to aries/agents/node/vcxagent-core/src/services/service-cred-issuer.js
diff --git a/agents/node/vcxagent-core/src/services/service-ledger-creddef.js b/aries/agents/node/vcxagent-core/src/services/service-ledger-creddef.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-ledger-creddef.js
rename to aries/agents/node/vcxagent-core/src/services/service-ledger-creddef.js
diff --git a/agents/node/vcxagent-core/src/services/service-ledger-schema.js b/aries/agents/node/vcxagent-core/src/services/service-ledger-schema.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-ledger-schema.js
rename to aries/agents/node/vcxagent-core/src/services/service-ledger-schema.js
diff --git a/agents/node/vcxagent-core/src/services/service-mediated-connections.js b/aries/agents/node/vcxagent-core/src/services/service-mediated-connections.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-mediated-connections.js
rename to aries/agents/node/vcxagent-core/src/services/service-mediated-connections.js
diff --git a/agents/node/vcxagent-core/src/services/service-out-of-band.js b/aries/agents/node/vcxagent-core/src/services/service-out-of-band.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-out-of-band.js
rename to aries/agents/node/vcxagent-core/src/services/service-out-of-band.js
diff --git a/agents/node/vcxagent-core/src/services/service-prover.js b/aries/agents/node/vcxagent-core/src/services/service-prover.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-prover.js
rename to aries/agents/node/vcxagent-core/src/services/service-prover.js
diff --git a/agents/node/vcxagent-core/src/services/service-revocation-registry.js b/aries/agents/node/vcxagent-core/src/services/service-revocation-registry.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-revocation-registry.js
rename to aries/agents/node/vcxagent-core/src/services/service-revocation-registry.js
diff --git a/agents/node/vcxagent-core/src/services/service-verifier.js b/aries/agents/node/vcxagent-core/src/services/service-verifier.js
similarity index 100%
rename from agents/node/vcxagent-core/src/services/service-verifier.js
rename to aries/agents/node/vcxagent-core/src/services/service-verifier.js
diff --git a/agents/node/vcxagent-core/src/storage/storage-file.js b/aries/agents/node/vcxagent-core/src/storage/storage-file.js
similarity index 100%
rename from agents/node/vcxagent-core/src/storage/storage-file.js
rename to aries/agents/node/vcxagent-core/src/storage/storage-file.js
diff --git a/agents/node/vcxagent-core/src/storage/storage-service.js b/aries/agents/node/vcxagent-core/src/storage/storage-service.js
similarity index 100%
rename from agents/node/vcxagent-core/src/storage/storage-service.js
rename to aries/agents/node/vcxagent-core/src/storage/storage-service.js
diff --git a/agents/node/vcxagent-core/src/utils/credentials.js b/aries/agents/node/vcxagent-core/src/utils/credentials.js
similarity index 100%
rename from agents/node/vcxagent-core/src/utils/credentials.js
rename to aries/agents/node/vcxagent-core/src/utils/credentials.js
diff --git a/agents/node/vcxagent-core/src/utils/messages.js b/aries/agents/node/vcxagent-core/src/utils/messages.js
similarity index 100%
rename from agents/node/vcxagent-core/src/utils/messages.js
rename to aries/agents/node/vcxagent-core/src/utils/messages.js
diff --git a/agents/node/vcxagent-core/src/utils/proofs.js b/aries/agents/node/vcxagent-core/src/utils/proofs.js
similarity index 100%
rename from agents/node/vcxagent-core/src/utils/proofs.js
rename to aries/agents/node/vcxagent-core/src/utils/proofs.js
diff --git a/agents/node/vcxagent-core/src/utils/vcx-workflows.js b/aries/agents/node/vcxagent-core/src/utils/vcx-workflows.js
similarity index 100%
rename from agents/node/vcxagent-core/src/utils/vcx-workflows.js
rename to aries/agents/node/vcxagent-core/src/utils/vcx-workflows.js
diff --git a/agents/node/vcxagent-core/test/connection.spec.js b/aries/agents/node/vcxagent-core/test/connection.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/connection.spec.js
rename to aries/agents/node/vcxagent-core/test/connection.spec.js
diff --git a/agents/node/vcxagent-core/test/distribute-tails.spec.js b/aries/agents/node/vcxagent-core/test/distribute-tails.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/distribute-tails.spec.js
rename to aries/agents/node/vcxagent-core/test/distribute-tails.spec.js
diff --git a/agents/node/vcxagent-core/test/endpoint.spec.js b/aries/agents/node/vcxagent-core/test/endpoint.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/endpoint.spec.js
rename to aries/agents/node/vcxagent-core/test/endpoint.spec.js
diff --git a/agents/node/vcxagent-core/test/issue-verify.spec.js b/aries/agents/node/vcxagent-core/test/issue-verify.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/issue-verify.spec.js
rename to aries/agents/node/vcxagent-core/test/issue-verify.spec.js
diff --git a/agents/node/vcxagent-core/test/messaging.spec.js b/aries/agents/node/vcxagent-core/test/messaging.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/messaging.spec.js
rename to aries/agents/node/vcxagent-core/test/messaging.spec.js
diff --git a/agents/node/vcxagent-core/test/out-of-band.spec.js b/aries/agents/node/vcxagent-core/test/out-of-band.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/out-of-band.spec.js
rename to aries/agents/node/vcxagent-core/test/out-of-band.spec.js
diff --git a/agents/node/vcxagent-core/test/public-invite.spec.js b/aries/agents/node/vcxagent-core/test/public-invite.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/public-invite.spec.js
rename to aries/agents/node/vcxagent-core/test/public-invite.spec.js
diff --git a/agents/node/vcxagent-core/test/sign-verify.spec.js b/aries/agents/node/vcxagent-core/test/sign-verify.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/sign-verify.spec.js
rename to aries/agents/node/vcxagent-core/test/sign-verify.spec.js
diff --git a/agents/node/vcxagent-core/test/trustping.spec.js b/aries/agents/node/vcxagent-core/test/trustping.spec.js
similarity index 100%
rename from agents/node/vcxagent-core/test/trustping.spec.js
rename to aries/agents/node/vcxagent-core/test/trustping.spec.js
diff --git a/agents/node/vcxagent-core/test/utils/alice.js b/aries/agents/node/vcxagent-core/test/utils/alice.js
similarity index 100%
rename from agents/node/vcxagent-core/test/utils/alice.js
rename to aries/agents/node/vcxagent-core/test/utils/alice.js
diff --git a/agents/node/vcxagent-core/test/utils/data.js b/aries/agents/node/vcxagent-core/test/utils/data.js
similarity index 100%
rename from agents/node/vcxagent-core/test/utils/data.js
rename to aries/agents/node/vcxagent-core/test/utils/data.js
diff --git a/agents/node/vcxagent-core/test/utils/faber.js b/aries/agents/node/vcxagent-core/test/utils/faber.js
similarity index 100%
rename from agents/node/vcxagent-core/test/utils/faber.js
rename to aries/agents/node/vcxagent-core/test/utils/faber.js
diff --git a/agents/node/vcxagent-core/test/utils/utils.js b/aries/agents/node/vcxagent-core/test/utils/utils.js
similarity index 100%
rename from agents/node/vcxagent-core/test/utils/utils.js
rename to aries/agents/node/vcxagent-core/test/utils/utils.js
diff --git a/agents/rust/mediator/.cargo/config.toml b/aries/agents/rust/mediator/.cargo/config.toml
similarity index 100%
rename from agents/rust/mediator/.cargo/config.toml
rename to aries/agents/rust/mediator/.cargo/config.toml
diff --git a/agents/rust/mediator/.gitignore b/aries/agents/rust/mediator/.gitignore
similarity index 100%
rename from agents/rust/mediator/.gitignore
rename to aries/agents/rust/mediator/.gitignore
diff --git a/agents/rust/mediator/Cargo.toml b/aries/agents/rust/mediator/Cargo.toml
similarity index 76%
rename from agents/rust/mediator/Cargo.toml
rename to aries/agents/rust/mediator/Cargo.toml
index 5d6393d447..6d89d5bfb2 100644
--- a/agents/rust/mediator/Cargo.toml
+++ b/aries/agents/rust/mediator/Cargo.toml
@@ -11,20 +11,20 @@ client = []
 
 [dependencies]
 anyhow = "1.0.75"
-aries_vcx = { path = "../../../aries_vcx" }
-aries_vcx_core = { path = "../../../aries_vcx_core", features = [
+aries_vcx = { path = "../../../../aries_vcx" }
+aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
     "vdrtools_wallet",
 ] }
 async-trait = "0.1.73"
 axum = "0.6"
 axum-macros = "0.3.8"
-diddoc_legacy = { path = "../../../diddoc_legacy" }
+diddoc_legacy = { path = "../../../../diddoc_legacy" }
 dotenvy = "0.15"
 env_logger = "0.10.0"
 fast_qr = { version = "0.10.2", features = ["svg"] }
 futures = "0.3.28"
 log = "0.4.20"
-messages = { path = "../../../messages" }
+messages = { path = "../../../../messages" }
 reqwest = { version = "0.11.20", features = ["json"] }
 serde = "1.0.188"
 serde_json = "1.0.106"
@@ -35,7 +35,7 @@ tower-http = { version = "0.4.4", features = ["catch-panic"] }
 url = "2.4.1"
 uuid = "1.4.1"
 mediation = { path = "./mediation" }
-test_utils = { path = "../../../tools/test_utils" }
+test_utils = { path = "../../../../tools/test_utils" }
 
 [dev-dependencies]
 base64-url = "2.0.0"
diff --git a/agents/rust/mediator/README.md b/aries/agents/rust/mediator/README.md
similarity index 100%
rename from agents/rust/mediator/README.md
rename to aries/agents/rust/mediator/README.md
diff --git a/agents/rust/mediator/client-tui/Cargo.toml b/aries/agents/rust/mediator/client-tui/Cargo.toml
similarity index 80%
rename from agents/rust/mediator/client-tui/Cargo.toml
rename to aries/agents/rust/mediator/client-tui/Cargo.toml
index 10dbbac948..ed55ef457e 100644
--- a/agents/rust/mediator/client-tui/Cargo.toml
+++ b/aries/agents/rust/mediator/client-tui/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
+aries_vcx_core = { path = "../../../../../aries_vcx_core", features = [
     "vdrtools_wallet",
 ] }
 axum = "0.6.20"
@@ -15,7 +15,7 @@ futures = "0.3.28"
 log = "0.4.20"
 mediation = { path = "../mediation" }
 mediator = { path = ".." }
-messages = { path = "../../../../messages" }
+messages = { path = "../../../../../messages" }
 reqwest = "0.11.22"
 serde_json = "1.0.107"
 
diff --git a/agents/rust/mediator/client-tui/src/lib.rs b/aries/agents/rust/mediator/client-tui/src/lib.rs
similarity index 100%
rename from agents/rust/mediator/client-tui/src/lib.rs
rename to aries/agents/rust/mediator/client-tui/src/lib.rs
diff --git a/agents/rust/mediator/client-tui/src/main.rs b/aries/agents/rust/mediator/client-tui/src/main.rs
similarity index 100%
rename from agents/rust/mediator/client-tui/src/main.rs
rename to aries/agents/rust/mediator/client-tui/src/main.rs
diff --git a/agents/rust/mediator/client-tui/src/tui.rs b/aries/agents/rust/mediator/client-tui/src/tui.rs
similarity index 100%
rename from agents/rust/mediator/client-tui/src/tui.rs
rename to aries/agents/rust/mediator/client-tui/src/tui.rs
diff --git a/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml b/aries/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
similarity index 100%
rename from agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
rename to aries/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
diff --git a/agents/rust/mediator/mediation/.gitignore b/aries/agents/rust/mediator/mediation/.gitignore
similarity index 100%
rename from agents/rust/mediator/mediation/.gitignore
rename to aries/agents/rust/mediator/mediation/.gitignore
diff --git a/agents/rust/mediator/mediation/Cargo.lock b/aries/agents/rust/mediator/mediation/Cargo.lock
similarity index 100%
rename from agents/rust/mediator/mediation/Cargo.lock
rename to aries/agents/rust/mediator/mediation/Cargo.lock
diff --git a/agents/rust/mediator/mediation/Cargo.toml b/aries/agents/rust/mediator/mediation/Cargo.toml
similarity index 96%
rename from agents/rust/mediator/mediation/Cargo.toml
rename to aries/agents/rust/mediator/mediation/Cargo.toml
index 7a3598d838..977aede451 100644
--- a/agents/rust/mediator/mediation/Cargo.toml
+++ b/aries/agents/rust/mediator/mediation/Cargo.toml
@@ -22,7 +22,7 @@ dotenvy = "0.15.7"
 env_logger = "0.10.0"
 futures = "0.3.28"
 log = "0.4.19"
-messages = { path = "../../../../messages" }
+messages = { path = "../../../../../messages" }
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.104"
 serde_with = { version = "3.1.0", features = ["base64"] }
diff --git a/agents/rust/mediator/mediation/README.md b/aries/agents/rust/mediator/mediation/README.md
similarity index 100%
rename from agents/rust/mediator/mediation/README.md
rename to aries/agents/rust/mediator/mediation/README.md
diff --git a/agents/rust/mediator/mediation/build.rs b/aries/agents/rust/mediator/mediation/build.rs
similarity index 100%
rename from agents/rust/mediator/mediation/build.rs
rename to aries/agents/rust/mediator/mediation/build.rs
diff --git a/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql b/aries/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql
similarity index 100%
rename from agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql
rename to aries/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql
diff --git a/agents/rust/mediator/mediation/src/didcomm_types.rs b/aries/agents/rust/mediator/mediation/src/didcomm_types.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/didcomm_types.rs
rename to aries/agents/rust/mediator/mediation/src/didcomm_types.rs
diff --git a/agents/rust/mediator/mediation/src/lib.rs b/aries/agents/rust/mediator/mediation/src/lib.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/lib.rs
rename to aries/agents/rust/mediator/mediation/src/lib.rs
diff --git a/agents/rust/mediator/mediation/src/logging.rs b/aries/agents/rust/mediator/mediation/src/logging.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/logging.rs
rename to aries/agents/rust/mediator/mediation/src/logging.rs
diff --git a/agents/rust/mediator/mediation/src/main.rs b/aries/agents/rust/mediator/mediation/src/main.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/main.rs
rename to aries/agents/rust/mediator/mediation/src/main.rs
diff --git a/agents/rust/mediator/mediation/src/router.rs b/aries/agents/rust/mediator/mediation/src/router.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/router.rs
rename to aries/agents/rust/mediator/mediation/src/router.rs
diff --git a/agents/rust/mediator/mediation/src/routes/coordination.rs b/aries/agents/rust/mediator/mediation/src/routes/coordination.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/coordination.rs
rename to aries/agents/rust/mediator/mediation/src/routes/coordination.rs
diff --git a/agents/rust/mediator/mediation/src/routes/forward.rs b/aries/agents/rust/mediator/mediation/src/routes/forward.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/forward.rs
rename to aries/agents/rust/mediator/mediation/src/routes/forward.rs
diff --git a/agents/rust/mediator/mediation/src/routes/hello_world.rs b/aries/agents/rust/mediator/mediation/src/routes/hello_world.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/hello_world.rs
rename to aries/agents/rust/mediator/mediation/src/routes/hello_world.rs
diff --git a/agents/rust/mediator/mediation/src/routes/json.rs b/aries/agents/rust/mediator/mediation/src/routes/json.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/json.rs
rename to aries/agents/rust/mediator/mediation/src/routes/json.rs
diff --git a/agents/rust/mediator/mediation/src/routes/mod.rs b/aries/agents/rust/mediator/mediation/src/routes/mod.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/mod.rs
rename to aries/agents/rust/mediator/mediation/src/routes/mod.rs
diff --git a/agents/rust/mediator/mediation/src/routes/pickup.rs b/aries/agents/rust/mediator/mediation/src/routes/pickup.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/routes/pickup.rs
rename to aries/agents/rust/mediator/mediation/src/routes/pickup.rs
diff --git a/agents/rust/mediator/mediation/src/server.rs b/aries/agents/rust/mediator/mediation/src/server.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/server.rs
rename to aries/agents/rust/mediator/mediation/src/server.rs
diff --git a/agents/rust/mediator/mediation/src/storage/database/any.rs b/aries/agents/rust/mediator/mediation/src/storage/database/any.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/storage/database/any.rs
rename to aries/agents/rust/mediator/mediation/src/storage/database/any.rs
diff --git a/agents/rust/mediator/mediation/src/storage/database/mod.rs b/aries/agents/rust/mediator/mediation/src/storage/database/mod.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/storage/database/mod.rs
rename to aries/agents/rust/mediator/mediation/src/storage/database/mod.rs
diff --git a/agents/rust/mediator/mediation/src/storage/database/mysql.rs b/aries/agents/rust/mediator/mediation/src/storage/database/mysql.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/storage/database/mysql.rs
rename to aries/agents/rust/mediator/mediation/src/storage/database/mysql.rs
diff --git a/agents/rust/mediator/mediation/src/storage/database/postgres.rs b/aries/agents/rust/mediator/mediation/src/storage/database/postgres.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/storage/database/postgres.rs
rename to aries/agents/rust/mediator/mediation/src/storage/database/postgres.rs
diff --git a/agents/rust/mediator/mediation/src/storage/mod.rs b/aries/agents/rust/mediator/mediation/src/storage/mod.rs
similarity index 100%
rename from agents/rust/mediator/mediation/src/storage/mod.rs
rename to aries/agents/rust/mediator/mediation/src/storage/mod.rs
diff --git a/agents/rust/mediator/mediation/tests/e2e-hello-test.rs b/aries/agents/rust/mediator/mediation/tests/e2e-hello-test.rs
similarity index 100%
rename from agents/rust/mediator/mediation/tests/e2e-hello-test.rs
rename to aries/agents/rust/mediator/mediation/tests/e2e-hello-test.rs
diff --git a/agents/rust/mediator/mediation/tests/e2e-persistence.rs b/aries/agents/rust/mediator/mediation/tests/e2e-persistence.rs
similarity index 100%
rename from agents/rust/mediator/mediation/tests/e2e-persistence.rs
rename to aries/agents/rust/mediator/mediation/tests/e2e-persistence.rs
diff --git a/agents/rust/mediator/mediation/tests/e2e-pickup.rs b/aries/agents/rust/mediator/mediation/tests/e2e-pickup.rs
similarity index 100%
rename from agents/rust/mediator/mediation/tests/e2e-pickup.rs
rename to aries/agents/rust/mediator/mediation/tests/e2e-pickup.rs
diff --git a/agents/rust/mediator/src/aries_agent/client/mod.rs b/aries/agents/rust/mediator/src/aries_agent/client/mod.rs
similarity index 100%
rename from agents/rust/mediator/src/aries_agent/client/mod.rs
rename to aries/agents/rust/mediator/src/aries_agent/client/mod.rs
diff --git a/agents/rust/mediator/src/aries_agent/client/transports.rs b/aries/agents/rust/mediator/src/aries_agent/client/transports.rs
similarity index 100%
rename from agents/rust/mediator/src/aries_agent/client/transports.rs
rename to aries/agents/rust/mediator/src/aries_agent/client/transports.rs
diff --git a/agents/rust/mediator/src/aries_agent/mod.rs b/aries/agents/rust/mediator/src/aries_agent/mod.rs
similarity index 100%
rename from agents/rust/mediator/src/aries_agent/mod.rs
rename to aries/agents/rust/mediator/src/aries_agent/mod.rs
diff --git a/agents/rust/mediator/src/aries_agent/utils.rs b/aries/agents/rust/mediator/src/aries_agent/utils.rs
similarity index 100%
rename from agents/rust/mediator/src/aries_agent/utils.rs
rename to aries/agents/rust/mediator/src/aries_agent/utils.rs
diff --git a/agents/rust/mediator/src/bin/mediator.rs b/aries/agents/rust/mediator/src/bin/mediator.rs
similarity index 100%
rename from agents/rust/mediator/src/bin/mediator.rs
rename to aries/agents/rust/mediator/src/bin/mediator.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/connection.rs b/aries/agents/rust/mediator/src/didcomm_handlers/connection.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/connection.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/connection.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/forward.rs b/aries/agents/rust/mediator/src/didcomm_handlers/forward.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/forward.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/forward.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs b/aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/mod.rs b/aries/agents/rust/mediator/src/didcomm_handlers/mod.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/mod.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/mod.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/pickup.rs b/aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/pickup.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs
diff --git a/agents/rust/mediator/src/didcomm_handlers/utils.rs b/aries/agents/rust/mediator/src/didcomm_handlers/utils.rs
similarity index 100%
rename from agents/rust/mediator/src/didcomm_handlers/utils.rs
rename to aries/agents/rust/mediator/src/didcomm_handlers/utils.rs
diff --git a/agents/rust/mediator/src/http_routes/mod.rs b/aries/agents/rust/mediator/src/http_routes/mod.rs
similarity index 100%
rename from agents/rust/mediator/src/http_routes/mod.rs
rename to aries/agents/rust/mediator/src/http_routes/mod.rs
diff --git a/agents/rust/mediator/src/lib.rs b/aries/agents/rust/mediator/src/lib.rs
similarity index 100%
rename from agents/rust/mediator/src/lib.rs
rename to aries/agents/rust/mediator/src/lib.rs
diff --git a/agents/rust/mediator/src/utils/binary_utils.rs b/aries/agents/rust/mediator/src/utils/binary_utils.rs
similarity index 100%
rename from agents/rust/mediator/src/utils/binary_utils.rs
rename to aries/agents/rust/mediator/src/utils/binary_utils.rs
diff --git a/agents/rust/mediator/src/utils/mod.rs b/aries/agents/rust/mediator/src/utils/mod.rs
similarity index 100%
rename from agents/rust/mediator/src/utils/mod.rs
rename to aries/agents/rust/mediator/src/utils/mod.rs
diff --git a/agents/rust/mediator/src/utils/prelude.rs b/aries/agents/rust/mediator/src/utils/prelude.rs
similarity index 100%
rename from agents/rust/mediator/src/utils/prelude.rs
rename to aries/agents/rust/mediator/src/utils/prelude.rs
diff --git a/agents/rust/mediator/src/utils/structs.rs b/aries/agents/rust/mediator/src/utils/structs.rs
similarity index 100%
rename from agents/rust/mediator/src/utils/structs.rs
rename to aries/agents/rust/mediator/src/utils/structs.rs
diff --git a/agents/rust/mediator/tests/common/agent_and_transport_utils.rs b/aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs
similarity index 100%
rename from agents/rust/mediator/tests/common/agent_and_transport_utils.rs
rename to aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs
diff --git a/agents/rust/mediator/tests/common/mod.rs b/aries/agents/rust/mediator/tests/common/mod.rs
similarity index 100%
rename from agents/rust/mediator/tests/common/mod.rs
rename to aries/agents/rust/mediator/tests/common/mod.rs
diff --git a/agents/rust/mediator/tests/mediator-aries-connection.rs b/aries/agents/rust/mediator/tests/mediator-aries-connection.rs
similarity index 100%
rename from agents/rust/mediator/tests/mediator-aries-connection.rs
rename to aries/agents/rust/mediator/tests/mediator-aries-connection.rs
diff --git a/agents/rust/mediator/tests/mediator-coord-protocol.rs b/aries/agents/rust/mediator/tests/mediator-coord-protocol.rs
similarity index 100%
rename from agents/rust/mediator/tests/mediator-coord-protocol.rs
rename to aries/agents/rust/mediator/tests/mediator-coord-protocol.rs
diff --git a/agents/rust/mediator/tests/mediator-oob-invitation.rs b/aries/agents/rust/mediator/tests/mediator-oob-invitation.rs
similarity index 100%
rename from agents/rust/mediator/tests/mediator-oob-invitation.rs
rename to aries/agents/rust/mediator/tests/mediator-oob-invitation.rs
diff --git a/agents/rust/mediator/tests/mediator-protocol-pickup.rs b/aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs
similarity index 100%
rename from agents/rust/mediator/tests/mediator-protocol-pickup.rs
rename to aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs
diff --git a/agents/rust/mediator/tests/mediator-routing-forward.rs b/aries/agents/rust/mediator/tests/mediator-routing-forward.rs
similarity index 100%
rename from agents/rust/mediator/tests/mediator-routing-forward.rs
rename to aries/agents/rust/mediator/tests/mediator-routing-forward.rs