hyperledger · Patrik-Stas · Nov 16, 2023 · Nov 12, 2023 · Nov 16, 2023 · Nov 16, 2023
diff --git a/.github/actions/build-napi/action.yml b/.github/actions/build-napi/action.yml
@@ -23,7 +23,7 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
         cache: npm
-        cache-dependency-path: ${{ github.workspace }}/wrappers/vcx-napi-rs/package-lock.json
+        cache-dependency-path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/package-lock.json
     - name: Install
       uses: actions-rs/toolchain@v1
       if: ${{ !inputs.docker }}
@@ -43,7 +43,7 @@ runs:
         key: ${{ inputs.target }}-cargo-registry
     - name: Install dependencies
       run: npm install
-      working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs
+      working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
       shell: bash
     - name: Build in docker
       uses: addnab/docker-run-action@v3
@@ -55,11 +55,11 @@ runs:
     - name: Build
       run: ${{ inputs.build }}
       if: ${{ !inputs.docker }}
-      working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs
+      working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
       shell: bash
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
         name: bindings-${{ inputs.target }}
-        path: ${{ github.workspace }}/wrappers/vcx-napi-rs/*.node
+        path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/*.node
         if-no-files-found: error
diff --git a/.github/actions/publish-napi/action.yml b/.github/actions/publish-napi/action.yml
@@ -18,21 +18,21 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
         cache: npm
-        cache-dependency-path: ${{ github.workspace }}/wrappers/vcx-napi-rs/package-lock.json
+        cache-dependency-path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/package-lock.json
     - name: Install dependencies
       run: npm install
-      working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs
+      working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
       shell: bash
     - name: Download napi artifacts
       uses: actions/download-artifact@v3
       with:
-        path: ${{ github.workspace }}/wrappers/vcx-napi-rs/artifacts
+        path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/artifacts
     - name: Move artifacts
       run: |
         find . -type d -not -path \*\*/artifacts/bindings-\* -path \*\*/artifacts/\*\* -mindepth 2 -maxdepth 2 -exec rm -rf {} \+
         ls -R artifacts
         npm run artifacts
-      working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs
+      working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
       shell: bash
     - name: Publish
       run: |
@@ -45,7 +45,7 @@ runs:
         else
            echo "New version was not defined, skipping release."
         fi
-      working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs
+      working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
       shell: bash
       env:
         NPMJS_TOKEN: ${{ inputs.npmjs-token }}

diff --git a/.github/actions/setup-testing-nodejs/action.yml b/.github/actions/setup-testing-nodejs/action.yml
@@ -43,12 +43,12 @@ runs:
         docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
     - name: "Build binding module"
       shell: bash
-      run: (cd wrappers/vcx-napi-rs && npm install && npm run build:napi:debug)
+      run: (cd aries/wrappers/vcx-napi-rs && npm install && npm run build:napi:debug)
     - name: "Transpile TS wrapper"
       shell: bash
-      run: (cd wrappers/node && npm install && npm run compile)
+      run: (cd aries/wrappers/node && npm install && npm run compile)
     - name: "Check wrappers"
       shell: bash
       run: |
-        ls -lah wrappers/vcx-napi-rs
-        ls -lah wrappers/node
+        ls -lah aries/wrappers/vcx-napi-rs
+        ls -lah aries/wrappers/node
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -339,7 +339,7 @@ jobs:
           rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
       - name: "Run libvcx_core integration tests"
         run: |
-          RUST_TEST_THREADS=1 cargo test --manifest-path="libvcx_core/Cargo.toml" -- --include-ignored;
+          RUST_TEST_THREADS=1 cargo test --manifest-path="aries/legacy/libvcx_core/Cargo.toml" -- --include-ignored;
 
   test-integration-did-crate:
     needs: workflow-setup
@@ -372,7 +372,7 @@ jobs:
           rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
           node-version: ${{ matrix.node-version }}
       - name: "Run wrapper integration tests"
-        run: (cd wrappers/node && npm run test:integration)
+        run: (cd aries/wrappers/node && npm run test:integration)
       - name: "Install vcxagent-core dependencies"
         run: (cd aries/agents/node/vcxagent-core && npm install)
       - name: "Run demo"
@@ -406,7 +406,7 @@ jobs:
         run: |
           if [[ "$PUBLISH_VERSION" ]]
           then
-            NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./wrappers/node/publish.sh
+            NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./aries/wrappers/node/publish.sh
           else
              echo "New version was not defined, skipping release."
           fi
@@ -460,7 +460,7 @@ jobs:
               env
               unset CC
               unset CXX
-              cd wrappers/vcx-napi-rs
+              cd aries/wrappers/vcx-napi-rs
               npm run build:napi
               strip *.node
           - host: macos-latest

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,17 +3,17 @@ resolver = "2"
 
 members = [
     "aries_vcx",
-    "libvcx_core",
-    "agency_client",
-    "libvdrtools",
+    "aries/legacy/libvcx_core",
+    "aries/legacy/agency_client",
+    "aries/legacy/libvdrtools",
     "messages_macros",
     "messages",
-    "shared_vcx",
-    "diddoc_legacy",
+    "aries/shared_vcx",
+    "aries/legacy/diddoc_legacy",
     "aries/agents/rust/mediator",
     "aries/agents/rust/mediator/client-tui",
-    "agents/rust/aries-vcx-agent",
-    "wrappers/vcx-napi-rs",
+    "aries/agents/rust/aries-vcx-agent",
+    "aries/wrappers/vcx-napi-rs",
     "aries_vcx_core",
     "uniffi_aries_vcx/core",
     "did_doc",
@@ -25,9 +25,9 @@ members = [
     "did_resolver_registry",
     "did_resolver_sov",
     "did_resolver_web",
-    "public_key",
+    "aries/public_key",
     "indy_ledger_response_parser",
-    "wallet_migrator",
+    "tools/wallet_migrator",
     "tools/simple_message_relay",
     "tools/test_utils",
     "tools/libvcx_logger",

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ The repository contains a set of crates to build [Aries](https://github.com/hype
   - [`aries_vcx`](aries_vcx) - Library implementing DIDComm protocols, with focus on verifiable credential issuance and verification.
   - [`messages`](messages) - Library for building and parsing Aries messages.
   - `aries_vcx_core` - Interfaces for interaction with ledgers, wallets and credentials.
-  - [`agents`](agents/rust) - Aries agents built on top of `aries_vcx`.
+  - [`agents`](aries/agents/rust) - Aries agents built on top of `aries_vcx`.
 
 ## General components
   - `did_parser` - Building and parsing [DIDs](https://w3c.github.io/did-core/).

diff --git a/aries/agents/node/.gitignore b/aries/agents/node/.gitignore
@@ -70,6 +70,6 @@ typings/
 # End of https://www.gitignore.io/api/node
 
 
-**/storage-*/
+vcxagent-core/storage-proofs/
 
 **/test/tmp
diff --git a/aries/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"
   }
-}
+}
diff --git a/aries/agents/node/vcxagent-core/readme.md b/aries/agents/node/vcxagent-core/readme.md
@@ -4,7 +4,7 @@ VCX Agent Core is implementation of simple agent with persistent file storage. I
 
 # Try it
 1. First step is to compile and `aries-vcx` and make it available on your system. Follow [instructions](../../../libvcx).
-2. You need to have mediator agent compatible with `aries-vcx`. See more [info](../../../README.md).
+2. You need to have mediator agent compatible with `aries-vcx`. See more [info](../../../../README.md).
 3. Run `npm run demo`. This will run sample scenario where Alice and Faber
     - establish connection, 
     - Faber issues a credential to Alice

diff --git a/agents/rust/aries-vcx-agent/.gitignore → aries/agents/rust/aries-vcx-agent/.gitignore b/agents/rust/aries-vcx-agent/.gitignore → aries/agents/rust/aries-vcx-agent/.gitignore
diff --git a/agents/rust/aries-vcx-agent/Cargo.toml → aries/agents/rust/aries-vcx-agent/Cargo.toml b/agents/rust/aries-vcx-agent/Cargo.toml → aries/agents/rust/aries-vcx-agent/Cargo.toml
@@ -7,8 +7,8 @@ edition.workspace = true
 
 [dependencies]
 serde = "1.0.145"
-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 = [
     "credx",
     "vdrtools_wallet",
 ] }

diff --git a/...aries-vcx-agent/src/agent/agent_config.rs → ...aries-vcx-agent/src/agent/agent_config.rs b/...aries-vcx-agent/src/agent/agent_config.rs → ...aries-vcx-agent/src/agent/agent_config.rs
diff --git a/...aries-vcx-agent/src/agent/agent_struct.rs → ...aries-vcx-agent/src/agent/agent_struct.rs b/...aries-vcx-agent/src/agent/agent_struct.rs → ...aries-vcx-agent/src/agent/agent_struct.rs
diff --git a/...ts/rust/aries-vcx-agent/src/agent/init.rs → ...ts/rust/aries-vcx-agent/src/agent/init.rs b/...ts/rust/aries-vcx-agent/src/agent/init.rs → ...ts/rust/aries-vcx-agent/src/agent/init.rs
diff --git a/agents/rust/aries-vcx-agent/src/agent/mod.rs → ...nts/rust/aries-vcx-agent/src/agent/mod.rs b/agents/rust/aries-vcx-agent/src/agent/mod.rs → ...nts/rust/aries-vcx-agent/src/agent/mod.rs
diff --git a/...t/aries-vcx-agent/src/error/convertors.rs → ...t/aries-vcx-agent/src/error/convertors.rs b/...t/aries-vcx-agent/src/error/convertors.rs → ...t/aries-vcx-agent/src/error/convertors.rs
diff --git a/...t/aries-vcx-agent/src/error/error_kind.rs → ...t/aries-vcx-agent/src/error/error_kind.rs b/...t/aries-vcx-agent/src/error/error_kind.rs → ...t/aries-vcx-agent/src/error/error_kind.rs
diff --git a/...aries-vcx-agent/src/error/error_struct.rs → ...aries-vcx-agent/src/error/error_struct.rs b/...aries-vcx-agent/src/error/error_struct.rs → ...aries-vcx-agent/src/error/error_struct.rs
diff --git a/agents/rust/aries-vcx-agent/src/error/mod.rs → ...nts/rust/aries-vcx-agent/src/error/mod.rs b/agents/rust/aries-vcx-agent/src/error/mod.rs → ...nts/rust/aries-vcx-agent/src/error/mod.rs
diff --git a/.../rust/aries-vcx-agent/src/error/result.rs → .../rust/aries-vcx-agent/src/error/result.rs b/.../rust/aries-vcx-agent/src/error/result.rs → .../rust/aries-vcx-agent/src/error/result.rs
diff --git a/agents/rust/aries-vcx-agent/src/http.rs → ...s/agents/rust/aries-vcx-agent/src/http.rs b/agents/rust/aries-vcx-agent/src/http.rs → ...s/agents/rust/aries-vcx-agent/src/http.rs
diff --git a/agents/rust/aries-vcx-agent/src/lib.rs → aries/agents/rust/aries-vcx-agent/src/lib.rs b/agents/rust/aries-vcx-agent/src/lib.rs → aries/agents/rust/aries-vcx-agent/src/lib.rs
diff --git a/...ries-vcx-agent/src/services/connection.rs → ...ries-vcx-agent/src/services/connection.rs b/...ries-vcx-agent/src/services/connection.rs → ...ries-vcx-agent/src/services/connection.rs
diff --git a/...ent/src/services/credential_definition.rs → ...ent/src/services/credential_definition.rs b/...ent/src/services/credential_definition.rs → ...ent/src/services/credential_definition.rs
diff --git a/...st/aries-vcx-agent/src/services/holder.rs → ...st/aries-vcx-agent/src/services/holder.rs b/...st/aries-vcx-agent/src/services/holder.rs → ...st/aries-vcx-agent/src/services/holder.rs
diff --git a/...st/aries-vcx-agent/src/services/issuer.rs → ...st/aries-vcx-agent/src/services/issuer.rs b/...st/aries-vcx-agent/src/services/issuer.rs → ...st/aries-vcx-agent/src/services/issuer.rs
diff --git a/.../rust/aries-vcx-agent/src/services/mod.rs → .../rust/aries-vcx-agent/src/services/mod.rs b/.../rust/aries-vcx-agent/src/services/mod.rs → .../rust/aries-vcx-agent/src/services/mod.rs
diff --git a/...st/aries-vcx-agent/src/services/prover.rs → ...st/aries-vcx-agent/src/services/prover.rs b/...st/aries-vcx-agent/src/services/prover.rs → ...st/aries-vcx-agent/src/services/prover.rs
diff --git a/...agent/src/services/revocation_registry.rs → ...agent/src/services/revocation_registry.rs b/...agent/src/services/revocation_registry.rs → ...agent/src/services/revocation_registry.rs
diff --git a/...st/aries-vcx-agent/src/services/schema.rs → ...st/aries-vcx-agent/src/services/schema.rs b/...st/aries-vcx-agent/src/services/schema.rs → ...st/aries-vcx-agent/src/services/schema.rs
diff --git a/.../aries-vcx-agent/src/services/verifier.rs → .../aries-vcx-agent/src/services/verifier.rs b/.../aries-vcx-agent/src/services/verifier.rs → .../aries-vcx-agent/src/services/verifier.rs
diff --git a/...s/rust/aries-vcx-agent/src/storage/mod.rs → ...s/rust/aries-vcx-agent/src/storage/mod.rs b/...s/rust/aries-vcx-agent/src/storage/mod.rs → ...s/rust/aries-vcx-agent/src/storage/mod.rs
diff --git a/...ies-vcx-agent/src/storage/object_cache.rs → ...ies-vcx-agent/src/storage/object_cache.rs b/...ies-vcx-agent/src/storage/object_cache.rs → ...ies-vcx-agent/src/storage/object_cache.rs
diff --git a/aries/agents/rust/mediator/Cargo.toml b/aries/agents/rust/mediator/Cargo.toml
@@ -18,7 +18,7 @@ aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
 async-trait = "0.1.73"
 axum = "0.6"
 axum-macros = "0.3.8"
-diddoc_legacy = { path = "../../../../diddoc_legacy" }
+diddoc_legacy = { path = "../../../../aries/legacy/diddoc_legacy" }
 dotenvy = "0.15"
 env_logger = "0.10.0"
 fast_qr = { version = "0.10.2", features = ["svg"] }

diff --git a/agency_client/Cargo.toml → aries/legacy/agency_client/Cargo.toml b/agency_client/Cargo.toml → aries/legacy/agency_client/Cargo.toml
@@ -20,4 +20,4 @@ url = { version = "2.3", features = ["serde"] }
 uuid = { version = "0.8", default-features = false, features = ["v4"]}
 thiserror = "1.0.37"
 async-trait = "0.1.73"
-shared_vcx = { path = "../shared_vcx" }
+shared_vcx = { path = "../../shared_vcx" }
diff --git a/agency_client/src/agency_client.rs → ...legacy/agency_client/src/agency_client.rs b/agency_client/src/agency_client.rs → ...legacy/agency_client/src/agency_client.rs
diff --git a/agency_client/src/api/agent.rs → aries/legacy/agency_client/src/api/agent.rs b/agency_client/src/api/agent.rs → aries/legacy/agency_client/src/api/agent.rs
diff --git a/agency_client/src/api/downloaded_message.rs → ...ency_client/src/api/downloaded_message.rs b/agency_client/src/api/downloaded_message.rs → ...ency_client/src/api/downloaded_message.rs
diff --git a/agency_client/src/api/messaging.rs → ...legacy/agency_client/src/api/messaging.rs b/agency_client/src/api/messaging.rs → ...legacy/agency_client/src/api/messaging.rs
diff --git a/agency_client/src/api/mod.rs → aries/legacy/agency_client/src/api/mod.rs b/agency_client/src/api/mod.rs → aries/legacy/agency_client/src/api/mod.rs
diff --git a/agency_client/src/api/onboarding.rs → ...egacy/agency_client/src/api/onboarding.rs b/agency_client/src/api/onboarding.rs → ...egacy/agency_client/src/api/onboarding.rs
diff --git a/agency_client/src/configuration.rs → ...legacy/agency_client/src/configuration.rs b/agency_client/src/configuration.rs → ...legacy/agency_client/src/configuration.rs
diff --git a/agency_client/src/errors/error.rs → .../legacy/agency_client/src/errors/error.rs b/agency_client/src/errors/error.rs → .../legacy/agency_client/src/errors/error.rs
diff --git a/...cy_client/src/errors/mapping_sharedvcx.rs → ...cy_client/src/errors/mapping_sharedvcx.rs b/...cy_client/src/errors/mapping_sharedvcx.rs → ...cy_client/src/errors/mapping_sharedvcx.rs
diff --git a/agency_client/src/errors/mod.rs → aries/legacy/agency_client/src/errors/mod.rs b/agency_client/src/errors/mod.rs → aries/legacy/agency_client/src/errors/mod.rs
diff --git a/agency_client/src/internal/messaging.rs → ...y/agency_client/src/internal/messaging.rs b/agency_client/src/internal/messaging.rs → ...y/agency_client/src/internal/messaging.rs
diff --git a/agency_client/src/internal/mod.rs → .../legacy/agency_client/src/internal/mod.rs b/agency_client/src/internal/mod.rs → .../legacy/agency_client/src/internal/mod.rs
diff --git a/agency_client/src/lib.rs → aries/legacy/agency_client/src/lib.rs b/agency_client/src/lib.rs → aries/legacy/agency_client/src/lib.rs
diff --git a/agency_client/src/messages/a2a_message.rs → ...agency_client/src/messages/a2a_message.rs b/agency_client/src/messages/a2a_message.rs → ...agency_client/src/messages/a2a_message.rs
diff --git a/agency_client/src/messages/connect.rs → ...acy/agency_client/src/messages/connect.rs b/agency_client/src/messages/connect.rs → ...acy/agency_client/src/messages/connect.rs
diff --git a/agency_client/src/messages/create_agent.rs → ...gency_client/src/messages/create_agent.rs b/agency_client/src/messages/create_agent.rs → ...gency_client/src/messages/create_agent.rs
diff --git a/agency_client/src/messages/create_key.rs → .../agency_client/src/messages/create_key.rs b/agency_client/src/messages/create_key.rs → .../agency_client/src/messages/create_key.rs
diff --git a/agency_client/src/messages/forward.rs → ...acy/agency_client/src/messages/forward.rs b/agency_client/src/messages/forward.rs → ...acy/agency_client/src/messages/forward.rs
diff --git a/agency_client/src/messages/get_messages.rs → ...gency_client/src/messages/get_messages.rs b/agency_client/src/messages/get_messages.rs → ...gency_client/src/messages/get_messages.rs
diff --git a/agency_client/src/messages/message_type.rs → ...gency_client/src/messages/message_type.rs b/agency_client/src/messages/message_type.rs → ...gency_client/src/messages/message_type.rs
diff --git a/agency_client/src/messages/mod.rs → .../legacy/agency_client/src/messages/mod.rs b/agency_client/src/messages/mod.rs → .../legacy/agency_client/src/messages/mod.rs
diff --git a/agency_client/src/messages/sign_up.rs → ...acy/agency_client/src/messages/sign_up.rs b/agency_client/src/messages/sign_up.rs → ...acy/agency_client/src/messages/sign_up.rs
diff --git a/..._client/src/messages/update_com_method.rs → ..._client/src/messages/update_com_method.rs b/..._client/src/messages/update_com_method.rs → ..._client/src/messages/update_com_method.rs
diff --git a/..._client/src/messages/update_connection.rs → ..._client/src/messages/update_connection.rs b/..._client/src/messages/update_connection.rs → ..._client/src/messages/update_connection.rs
diff --git a/agency_client/src/messages/update_message.rs → ...ncy_client/src/messages/update_message.rs b/agency_client/src/messages/update_message.rs → ...ncy_client/src/messages/update_message.rs
diff --git a/agency_client/src/testing/mocking.rs → ...gacy/agency_client/src/testing/mocking.rs b/agency_client/src/testing/mocking.rs → ...gacy/agency_client/src/testing/mocking.rs
diff --git a/agency_client/src/testing/mod.rs → ...s/legacy/agency_client/src/testing/mod.rs b/agency_client/src/testing/mod.rs → ...s/legacy/agency_client/src/testing/mod.rs
diff --git a/agency_client/src/testing/test_constants.rs → ...ency_client/src/testing/test_constants.rs b/agency_client/src/testing/test_constants.rs → ...ency_client/src/testing/test_constants.rs
diff --git a/agency_client/src/testing/test_settings.rs → ...gency_client/src/testing/test_settings.rs b/agency_client/src/testing/test_settings.rs → ...gency_client/src/testing/test_settings.rs
diff --git a/agency_client/src/testing/test_utils.rs → ...y/agency_client/src/testing/test_utils.rs b/agency_client/src/testing/test_utils.rs → ...y/agency_client/src/testing/test_utils.rs
diff --git a/...y_client/src/utils/encryption_envelope.rs → ...y_client/src/utils/encryption_envelope.rs b/...y_client/src/utils/encryption_envelope.rs → ...y_client/src/utils/encryption_envelope.rs
diff --git a/agency_client/src/utils/mod.rs → aries/legacy/agency_client/src/utils/mod.rs b/agency_client/src/utils/mod.rs → aries/legacy/agency_client/src/utils/mod.rs
diff --git a/...t/src/wallet/base_agency_client_wallet.rs → ...t/src/wallet/base_agency_client_wallet.rs b/...t/src/wallet/base_agency_client_wallet.rs → ...t/src/wallet/base_agency_client_wallet.rs
diff --git a/agency_client/src/wallet/mod.rs → aries/legacy/agency_client/src/wallet/mod.rs b/agency_client/src/wallet/mod.rs → aries/legacy/agency_client/src/wallet/mod.rs
diff --git a/diddoc_legacy/Cargo.toml → aries/legacy/diddoc_legacy/Cargo.toml b/diddoc_legacy/Cargo.toml → aries/legacy/diddoc_legacy/Cargo.toml
@@ -14,7 +14,7 @@ serde_json = "1.0.40"
 serde_derive = "1.0.97"
 url = { version = "2.3", features = ["serde"] }
 thiserror = "1.0.37"
-shared_vcx = { path = "../shared_vcx" }
+shared_vcx = { path = "../../shared_vcx" }
 
 [dev-dependencies]
 serde_json = "1.0.91"
diff --git a/diddoc_legacy/src/aries/diddoc.rs → .../legacy/diddoc_legacy/src/aries/diddoc.rs b/diddoc_legacy/src/aries/diddoc.rs → .../legacy/diddoc_legacy/src/aries/diddoc.rs
diff --git a/diddoc_legacy/src/aries/mod.rs → aries/legacy/diddoc_legacy/src/aries/mod.rs b/diddoc_legacy/src/aries/mod.rs → aries/legacy/diddoc_legacy/src/aries/mod.rs
diff --git a/diddoc_legacy/src/aries/service.rs → ...legacy/diddoc_legacy/src/aries/service.rs b/diddoc_legacy/src/aries/service.rs → ...legacy/diddoc_legacy/src/aries/service.rs
diff --git a/diddoc_legacy/src/errors/error.rs → .../legacy/diddoc_legacy/src/errors/error.rs b/diddoc_legacy/src/errors/error.rs → .../legacy/diddoc_legacy/src/errors/error.rs
diff --git a/...oc_legacy/src/errors/mapping_sharedvcx.rs → ...oc_legacy/src/errors/mapping_sharedvcx.rs b/...oc_legacy/src/errors/mapping_sharedvcx.rs → ...oc_legacy/src/errors/mapping_sharedvcx.rs
diff --git a/diddoc_legacy/src/errors/mod.rs → aries/legacy/diddoc_legacy/src/errors/mod.rs b/diddoc_legacy/src/errors/mod.rs → aries/legacy/diddoc_legacy/src/errors/mod.rs
diff --git a/diddoc_legacy/src/lib.rs → aries/legacy/diddoc_legacy/src/lib.rs b/diddoc_legacy/src/lib.rs → aries/legacy/diddoc_legacy/src/lib.rs
diff --git a/diddoc_legacy/src/w3c/diddoc.rs → aries/legacy/diddoc_legacy/src/w3c/diddoc.rs b/diddoc_legacy/src/w3c/diddoc.rs → aries/legacy/diddoc_legacy/src/w3c/diddoc.rs
diff --git a/diddoc_legacy/src/w3c/mod.rs → aries/legacy/diddoc_legacy/src/w3c/mod.rs b/diddoc_legacy/src/w3c/mod.rs → aries/legacy/diddoc_legacy/src/w3c/mod.rs
diff --git a/diddoc_legacy/src/w3c/model.rs → aries/legacy/diddoc_legacy/src/w3c/model.rs b/diddoc_legacy/src/w3c/model.rs → aries/legacy/diddoc_legacy/src/w3c/model.rs
diff --git a/diddoc_legacy/src/w3c/service.rs → ...s/legacy/diddoc_legacy/src/w3c/service.rs b/diddoc_legacy/src/w3c/service.rs → ...s/legacy/diddoc_legacy/src/w3c/service.rs
diff --git a/libvcx_core/Cargo.toml → aries/legacy/libvcx_core/Cargo.toml b/libvcx_core/Cargo.toml → aries/legacy/libvcx_core/Cargo.toml
@@ -23,17 +23,17 @@ serde = "1.0.97"
 serde_json = "1.0.40"
 serde_derive = "1.0.97"
 futures = { version = "0.3", default-features = false }
-aries_vcx = { path = "../aries_vcx", features = ["credx", "vdrtools_wallet"] }
-aries_vcx_core = { path = "../aries_vcx_core" }
+aries_vcx = { path = "../../../aries_vcx", features = ["credx", "vdrtools_wallet"] }
+aries_vcx_core = { path = "../../../aries_vcx_core" }
 diddoc_legacy = { path = "../diddoc_legacy" }
 thiserror = "1.0.37"
 uuid = { version = "1.4.1", default-features = false, features = ["v4"] }
 agency_client = { path = "../agency_client" }
 async-trait = "0.1.61"
 url = "2.3.1"
-wallet_migrator = { path = "../wallet_migrator" }
-shared_vcx = { path = "../shared_vcx" }
+wallet_migrator = { path = "../../../tools/wallet_migrator" }
+shared_vcx = { path = "../../shared_vcx" }
 
 [dev-dependencies]
-test_utils = {path = "../tools/test_utils" }
+test_utils = {path = "../../../tools/test_utils" }
 tokio = { version = "1.20", features = [ "rt", "macros" ] }
diff --git a/libvcx_core/build.rs → aries/legacy/libvcx_core/build.rs b/libvcx_core/build.rs → aries/legacy/libvcx_core/build.rs
diff --git a/...e/src/api_vcx/api_global/agency_client.rs → ...e/src/api_vcx/api_global/agency_client.rs b/...e/src/api_vcx/api_global/agency_client.rs → ...e/src/api_vcx/api_global/agency_client.rs
diff --git a/libvcx_core/src/api_vcx/api_global/ledger.rs → ...vcx_core/src/api_vcx/api_global/ledger.rs b/libvcx_core/src/api_vcx/api_global/ledger.rs → ...vcx_core/src/api_vcx/api_global/ledger.rs
diff --git a/libvcx_core/src/api_vcx/api_global/mod.rs → ...libvcx_core/src/api_vcx/api_global/mod.rs b/libvcx_core/src/api_vcx/api_global/mod.rs → ...libvcx_core/src/api_vcx/api_global/mod.rs
diff --git a/libvcx_core/src/api_vcx/api_global/pool.rs → ...ibvcx_core/src/api_vcx/api_global/pool.rs b/libvcx_core/src/api_vcx/api_global/pool.rs → ...ibvcx_core/src/api_vcx/api_global/pool.rs
diff --git a/...cx_core/src/api_vcx/api_global/profile.rs → ...cx_core/src/api_vcx/api_global/profile.rs b/...cx_core/src/api_vcx/api_global/profile.rs → ...cx_core/src/api_vcx/api_global/profile.rs
diff --git a/libvcx_core/src/api_vcx/api_global/state.rs → ...bvcx_core/src/api_vcx/api_global/state.rs b/libvcx_core/src/api_vcx/api_global/state.rs → ...bvcx_core/src/api_vcx/api_global/state.rs
diff --git a/libvcx_core/src/api_vcx/api_global/wallet.rs → ...vcx_core/src/api_vcx/api_global/wallet.rs b/libvcx_core/src/api_vcx/api_global/wallet.rs → ...vcx_core/src/api_vcx/api_global/wallet.rs
diff --git a/...core/src/api_vcx/api_handle/connection.rs → ...core/src/api_vcx/api_handle/connection.rs b/...core/src/api_vcx/api_handle/connection.rs → ...core/src/api_vcx/api_handle/connection.rs
diff --git a/...core/src/api_vcx/api_handle/credential.rs → ...core/src/api_vcx/api_handle/credential.rs b/...core/src/api_vcx/api_handle/credential.rs → ...core/src/api_vcx/api_handle/credential.rs
diff --git a/.../src/api_vcx/api_handle/credential_def.rs → .../src/api_vcx/api_handle/credential_def.rs b/.../src/api_vcx/api_handle/credential_def.rs → .../src/api_vcx/api_handle/credential_def.rs
diff --git a/...src/api_vcx/api_handle/disclosed_proof.rs → ...src/api_vcx/api_handle/disclosed_proof.rs b/...src/api_vcx/api_handle/disclosed_proof.rs → ...src/api_vcx/api_handle/disclosed_proof.rs
diff --git a/...c/api_vcx/api_handle/issuer_credential.rs → ...c/api_vcx/api_handle/issuer_credential.rs b/...c/api_vcx/api_handle/issuer_credential.rs → ...c/api_vcx/api_handle/issuer_credential.rs
diff --git a/...api_vcx/api_handle/mediated_connection.rs → ...api_vcx/api_handle/mediated_connection.rs b/...api_vcx/api_handle/mediated_connection.rs → ...api_vcx/api_handle/mediated_connection.rs
diff --git a/libvcx_core/src/api_vcx/api_handle/mod.rs → ...libvcx_core/src/api_vcx/api_handle/mod.rs b/libvcx_core/src/api_vcx/api_handle/mod.rs → ...libvcx_core/src/api_vcx/api_handle/mod.rs
diff --git a/...rc/api_vcx/api_handle/object_cache/mod.rs → ...rc/api_vcx/api_handle/object_cache/mod.rs b/...rc/api_vcx/api_handle/object_cache/mod.rs → ...rc/api_vcx/api_handle/object_cache/mod.rs
diff --git a/...ore/src/api_vcx/api_handle/out_of_band.rs → ...ore/src/api_vcx/api_handle/out_of_band.rs b/...ore/src/api_vcx/api_handle/out_of_band.rs → ...ore/src/api_vcx/api_handle/out_of_band.rs
diff --git a/libvcx_core/src/api_vcx/api_handle/proof.rs → ...bvcx_core/src/api_vcx/api_handle/proof.rs b/libvcx_core/src/api_vcx/api_handle/proof.rs → ...bvcx_core/src/api_vcx/api_handle/proof.rs
diff --git a/...api_vcx/api_handle/revocation_registry.rs → ...api_vcx/api_handle/revocation_registry.rs b/...api_vcx/api_handle/revocation_registry.rs → ...api_vcx/api_handle/revocation_registry.rs
diff --git a/libvcx_core/src/api_vcx/api_handle/schema.rs → ...vcx_core/src/api_vcx/api_handle/schema.rs b/libvcx_core/src/api_vcx/api_handle/schema.rs → ...vcx_core/src/api_vcx/api_handle/schema.rs
diff --git a/libvcx_core/src/api_vcx/mod.rs → aries/legacy/libvcx_core/src/api_vcx/mod.rs b/libvcx_core/src/api_vcx/mod.rs → aries/legacy/libvcx_core/src/api_vcx/mod.rs
diff --git a/libvcx_core/src/api_vcx/utils/mod.rs → ...gacy/libvcx_core/src/api_vcx/utils/mod.rs b/libvcx_core/src/api_vcx/utils/mod.rs → ...gacy/libvcx_core/src/api_vcx/utils/mod.rs
diff --git a/...re/src/api_vcx/utils/version_constants.rs → ...re/src/api_vcx/utils/version_constants.rs b/...re/src/api_vcx/utils/version_constants.rs → ...re/src/api_vcx/utils/version_constants.rs
diff --git a/libvcx_core/src/errors/error.rs → aries/legacy/libvcx_core/src/errors/error.rs b/libvcx_core/src/errors/error.rs → aries/legacy/libvcx_core/src/errors/error.rs
diff --git a/libvcx_core/src/errors/mapping_ffi_tests.rs → ...bvcx_core/src/errors/mapping_ffi_tests.rs b/libvcx_core/src/errors/mapping_ffi_tests.rs → ...bvcx_core/src/errors/mapping_ffi_tests.rs
diff --git a/.../src/errors/mapping_from_agency_client.rs → .../src/errors/mapping_from_agency_client.rs b/.../src/errors/mapping_from_agency_client.rs → .../src/errors/mapping_from_agency_client.rs
diff --git a/..._core/src/errors/mapping_from_ariesvcx.rs → ..._core/src/errors/mapping_from_ariesvcx.rs b/..._core/src/errors/mapping_from_ariesvcx.rs → ..._core/src/errors/mapping_from_ariesvcx.rs
diff --git a/...e/src/errors/mapping_from_ariesvcxcore.rs → ...e/src/errors/mapping_from_ariesvcxcore.rs b/...e/src/errors/mapping_from_ariesvcxcore.rs → ...e/src/errors/mapping_from_ariesvcxcore.rs
diff --git a/...cx_core/src/errors/mapping_from_others.rs → ...cx_core/src/errors/mapping_from_others.rs b/...cx_core/src/errors/mapping_from_others.rs → ...cx_core/src/errors/mapping_from_others.rs
diff --git a/libvcx_core/src/errors/mapping_to_u32.rs → .../libvcx_core/src/errors/mapping_to_u32.rs b/libvcx_core/src/errors/mapping_to_u32.rs → .../libvcx_core/src/errors/mapping_to_u32.rs
diff --git a/libvcx_core/src/errors/mod.rs → aries/legacy/libvcx_core/src/errors/mod.rs b/libvcx_core/src/errors/mod.rs → aries/legacy/libvcx_core/src/errors/mod.rs
diff --git a/libvcx_core/src/lib.rs → aries/legacy/libvcx_core/src/lib.rs b/libvcx_core/src/lib.rs → aries/legacy/libvcx_core/src/lib.rs
diff --git a/libvdrtools/Cargo.toml → aries/legacy/libvdrtools/Cargo.toml b/libvdrtools/Cargo.toml → aries/legacy/libvdrtools/Cargo.toml
@@ -40,9 +40,9 @@ serde_derive = "1"
 lazy_static = "1"
 zeroize = "1"
 regex = "1"
-indy-api-types = { path = "./indy-api-types"}
-indy-utils = { path = "./indy-utils"}
-indy-wallet = { path = "./indy-wallet"}
+indy-api-types = { path = "indy-api-types" }
+indy-utils = { path = "indy-utils" }
+indy-wallet = { path = "indy-wallet" }
 futures = { version = "0.3", default-features = false, features = [ "executor", "alloc", "thread-pool" ] }
 ursa = { version = "0.3.7", optional = true, default-features = false, features = ["cl_native"] }
 

diff --git a/libvdrtools/indy-api-types/Cargo.toml → ...acy/libvdrtools/indy-api-types/Cargo.toml b/libvdrtools/indy-api-types/Cargo.toml → ...acy/libvdrtools/indy-api-types/Cargo.toml
diff --git a/libvdrtools/indy-api-types/src/domain/mod.rs → ...vdrtools/indy-api-types/src/domain/mod.rs b/libvdrtools/indy-api-types/src/domain/mod.rs → ...vdrtools/indy-api-types/src/domain/mod.rs
diff --git a/...s/indy-api-types/src/domain/wallet/mod.rs → ...s/indy-api-types/src/domain/wallet/mod.rs b/...s/indy-api-types/src/domain/wallet/mod.rs → ...s/indy-api-types/src/domain/wallet/mod.rs
diff --git a/libvdrtools/indy-api-types/src/errors.rs → .../libvdrtools/indy-api-types/src/errors.rs b/libvdrtools/indy-api-types/src/errors.rs → .../libvdrtools/indy-api-types/src/errors.rs
diff --git a/libvdrtools/indy-api-types/src/lib.rs → ...acy/libvdrtools/indy-api-types/src/lib.rs b/libvdrtools/indy-api-types/src/lib.rs → ...acy/libvdrtools/indy-api-types/src/lib.rs
diff --git a/libvdrtools/indy-utils/Cargo.toml → .../legacy/libvdrtools/indy-utils/Cargo.toml b/libvdrtools/indy-utils/Cargo.toml → .../legacy/libvdrtools/indy-utils/Cargo.toml
@@ -22,7 +22,7 @@ randombytes_sodium = []
 base64 = {version = "0.21"}
 dirs = "5"
 failure = "0.1"
-indy-api-types = { path = "../indy-api-types"}
+indy-api-types = { path = "../indy-api-types" }
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"

diff --git a/...dy-utils/src/crypto/base64/rust_base64.rs → ...dy-utils/src/crypto/base64/rust_base64.rs b/...dy-utils/src/crypto/base64/rust_base64.rs → ...dy-utils/src/crypto/base64/rust_base64.rs
diff --git a/...rc/crypto/chacha20poly1305_ietf/sodium.rs → ...rc/crypto/chacha20poly1305_ietf/sodium.rs b/...rc/crypto/chacha20poly1305_ietf/sodium.rs → ...rc/crypto/chacha20poly1305_ietf/sodium.rs
diff --git a/...dy-utils/src/crypto/ed25519_box/sodium.rs → ...dy-utils/src/crypto/ed25519_box/sodium.rs b/...dy-utils/src/crypto/ed25519_box/sodium.rs → ...dy-utils/src/crypto/ed25519_box/sodium.rs
diff --git a/...y-utils/src/crypto/ed25519_sign/sodium.rs → ...y-utils/src/crypto/ed25519_sign/sodium.rs b/...y-utils/src/crypto/ed25519_sign/sodium.rs → ...y-utils/src/crypto/ed25519_sign/sodium.rs
diff --git a/...ols/indy-utils/src/crypto/hash/openssl.rs → ...ols/indy-utils/src/crypto/hash/openssl.rs b/...ols/indy-utils/src/crypto/hash/openssl.rs → ...ols/indy-utils/src/crypto/hash/openssl.rs
diff --git a/...ndy-utils/src/crypto/hmacsha256/sodium.rs → ...ndy-utils/src/crypto/hmacsha256/sodium.rs b/...ndy-utils/src/crypto/hmacsha256/sodium.rs → ...ndy-utils/src/crypto/hmacsha256/sodium.rs
diff --git a/libvdrtools/indy-utils/src/crypto/mod.rs → .../libvdrtools/indy-utils/src/crypto/mod.rs b/libvdrtools/indy-utils/src/crypto/mod.rs → .../libvdrtools/indy-utils/src/crypto/mod.rs
diff --git a/...ils/src/crypto/pwhash_argon2i13/sodium.rs → ...ils/src/crypto/pwhash_argon2i13/sodium.rs b/...ils/src/crypto/pwhash_argon2i13/sodium.rs → ...ils/src/crypto/pwhash_argon2i13/sodium.rs
diff --git a/...dy-utils/src/crypto/randombytes/sodium.rs → ...dy-utils/src/crypto/randombytes/sodium.rs b/...dy-utils/src/crypto/randombytes/sodium.rs → ...dy-utils/src/crypto/randombytes/sodium.rs
diff --git a/...indy-utils/src/crypto/sealedbox/sodium.rs → ...indy-utils/src/crypto/sealedbox/sodium.rs b/...indy-utils/src/crypto/sealedbox/sodium.rs → ...indy-utils/src/crypto/sealedbox/sodium.rs
diff --git a/...ools/indy-utils/src/crypto/sodium_type.rs → ...ools/indy-utils/src/crypto/sodium_type.rs b/...ools/indy-utils/src/crypto/sodium_type.rs → ...ools/indy-utils/src/crypto/sodium_type.rs
diff --git a/.../indy-utils/src/crypto/xsalsa20/sodium.rs → .../indy-utils/src/crypto/xsalsa20/sodium.rs b/.../indy-utils/src/crypto/xsalsa20/sodium.rs → .../indy-utils/src/crypto/xsalsa20/sodium.rs
diff --git a/libvdrtools/indy-utils/src/environment.rs → ...libvdrtools/indy-utils/src/environment.rs b/libvdrtools/indy-utils/src/environment.rs → ...libvdrtools/indy-utils/src/environment.rs
diff --git a/libvdrtools/indy-utils/src/lib.rs → .../legacy/libvdrtools/indy-utils/src/lib.rs b/libvdrtools/indy-utils/src/lib.rs → .../legacy/libvdrtools/indy-utils/src/lib.rs
diff --git a/libvdrtools/indy-utils/src/sequence.rs → ...cy/libvdrtools/indy-utils/src/sequence.rs b/libvdrtools/indy-utils/src/sequence.rs → ...cy/libvdrtools/indy-utils/src/sequence.rs
diff --git a/libvdrtools/indy-utils/src/wql.rs → .../legacy/libvdrtools/indy-utils/src/wql.rs b/libvdrtools/indy-utils/src/wql.rs → .../legacy/libvdrtools/indy-utils/src/wql.rs
diff --git a/libvdrtools/indy-wallet/Cargo.toml → ...legacy/libvdrtools/indy-wallet/Cargo.toml b/libvdrtools/indy-wallet/Cargo.toml → ...legacy/libvdrtools/indy-wallet/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0.1"
 byteorder = "1"
 futures = { version = "0.3", default-features = false, features = [ "alloc" ] }
 indy-api-types = { path = "../indy-api-types" }
-indy-utils = { path = "../indy-utils"}
+indy-utils = { path = "../indy-utils" }
 libc = "0.2"
 log = "0.4"
 rmp-serde = "1"

diff --git a/libvdrtools/indy-wallet/src/cache/lru.rs → .../libvdrtools/indy-wallet/src/cache/lru.rs b/libvdrtools/indy-wallet/src/cache/lru.rs → .../libvdrtools/indy-wallet/src/cache/lru.rs
diff --git a/libvdrtools/indy-wallet/src/cache/mod.rs → .../libvdrtools/indy-wallet/src/cache/mod.rs b/libvdrtools/indy-wallet/src/cache/mod.rs → .../libvdrtools/indy-wallet/src/cache/mod.rs
diff --git a/...ols/indy-wallet/src/cache/wallet_cache.rs → ...ols/indy-wallet/src/cache/wallet_cache.rs b/...ols/indy-wallet/src/cache/wallet_cache.rs → ...ols/indy-wallet/src/cache/wallet_cache.rs
diff --git a/libvdrtools/indy-wallet/src/encryption.rs → ...libvdrtools/indy-wallet/src/encryption.rs b/libvdrtools/indy-wallet/src/encryption.rs → ...libvdrtools/indy-wallet/src/encryption.rs
diff --git a/libvdrtools/indy-wallet/src/export_import.rs → ...vdrtools/indy-wallet/src/export_import.rs b/libvdrtools/indy-wallet/src/export_import.rs → ...vdrtools/indy-wallet/src/export_import.rs
diff --git a/libvdrtools/indy-wallet/src/iterator.rs → ...y/libvdrtools/indy-wallet/src/iterator.rs b/libvdrtools/indy-wallet/src/iterator.rs → ...y/libvdrtools/indy-wallet/src/iterator.rs
diff --git a/libvdrtools/indy-wallet/src/language.rs → ...y/libvdrtools/indy-wallet/src/language.rs b/libvdrtools/indy-wallet/src/language.rs → ...y/libvdrtools/indy-wallet/src/language.rs
diff --git a/libvdrtools/indy-wallet/src/lib.rs → ...legacy/libvdrtools/indy-wallet/src/lib.rs b/libvdrtools/indy-wallet/src/lib.rs → ...legacy/libvdrtools/indy-wallet/src/lib.rs
diff --git a/...tools/indy-wallet/src/query_encryption.rs → ...tools/indy-wallet/src/query_encryption.rs b/...tools/indy-wallet/src/query_encryption.rs → ...tools/indy-wallet/src/query_encryption.rs
diff --git a/...ls/indy-wallet/src/storage/default/mod.rs → ...ls/indy-wallet/src/storage/default/mod.rs b/...ls/indy-wallet/src/storage/default/mod.rs → ...ls/indy-wallet/src/storage/default/mod.rs
diff --git a/.../indy-wallet/src/storage/default/query.rs → .../indy-wallet/src/storage/default/query.rs b/.../indy-wallet/src/storage/default/query.rs → .../indy-wallet/src/storage/default/query.rs
diff --git a/libvdrtools/indy-wallet/src/storage/mod.rs → ...ibvdrtools/indy-wallet/src/storage/mod.rs b/libvdrtools/indy-wallet/src/storage/mod.rs → ...ibvdrtools/indy-wallet/src/storage/mod.rs
diff --git a/...ools/indy-wallet/src/storage/mysql/mod.rs → ...ools/indy-wallet/src/storage/mysql/mod.rs b/...ools/indy-wallet/src/storage/mysql/mod.rs → ...ools/indy-wallet/src/storage/mysql/mod.rs
diff --git a/...ls/indy-wallet/src/storage/mysql/query.rs → ...ls/indy-wallet/src/storage/mysql/query.rs b/...ls/indy-wallet/src/storage/mysql/query.rs → ...ls/indy-wallet/src/storage/mysql/query.rs
diff --git a/libvdrtools/indy-wallet/src/wallet.rs → ...acy/libvdrtools/indy-wallet/src/wallet.rs b/libvdrtools/indy-wallet/src/wallet.rs → ...acy/libvdrtools/indy-wallet/src/wallet.rs
diff --git a/libvdrtools/src/controllers/crypto.rs → ...acy/libvdrtools/src/controllers/crypto.rs b/libvdrtools/src/controllers/crypto.rs → ...acy/libvdrtools/src/controllers/crypto.rs
diff --git a/libvdrtools/src/controllers/did.rs → ...legacy/libvdrtools/src/controllers/did.rs b/libvdrtools/src/controllers/did.rs → ...legacy/libvdrtools/src/controllers/did.rs
diff --git a/libvdrtools/src/controllers/mod.rs → ...legacy/libvdrtools/src/controllers/mod.rs b/libvdrtools/src/controllers/mod.rs → ...legacy/libvdrtools/src/controllers/mod.rs
diff --git a/libvdrtools/src/controllers/non_secrets.rs → ...ibvdrtools/src/controllers/non_secrets.rs b/libvdrtools/src/controllers/non_secrets.rs → ...ibvdrtools/src/controllers/non_secrets.rs
diff --git a/libvdrtools/src/controllers/wallet.rs → ...acy/libvdrtools/src/controllers/wallet.rs b/libvdrtools/src/controllers/wallet.rs → ...acy/libvdrtools/src/controllers/wallet.rs
diff --git a/...rtools/src/domain/anoncreds/credential.rs → ...rtools/src/domain/anoncreds/credential.rs b/...rtools/src/domain/anoncreds/credential.rs → ...rtools/src/domain/anoncreds/credential.rs
diff --git a/...domain/anoncreds/credential_definition.rs → ...domain/anoncreds/credential_definition.rs b/...domain/anoncreds/credential_definition.rs → ...domain/anoncreds/credential_definition.rs
diff --git a/.../src/domain/anoncreds/credential_offer.rs → .../src/domain/anoncreds/credential_offer.rs b/.../src/domain/anoncreds/credential_offer.rs → .../src/domain/anoncreds/credential_offer.rs
diff --git a/...rc/domain/anoncreds/credential_request.rs → ...rc/domain/anoncreds/credential_request.rs b/...rc/domain/anoncreds/credential_request.rs → ...rc/domain/anoncreds/credential_request.rs
diff --git a/.../src/domain/anoncreds/indy_identifiers.rs → .../src/domain/anoncreds/indy_identifiers.rs b/.../src/domain/anoncreds/indy_identifiers.rs → .../src/domain/anoncreds/indy_identifiers.rs
diff --git a/...ols/src/domain/anoncreds/master_secret.rs → ...ols/src/domain/anoncreds/master_secret.rs b/...ols/src/domain/anoncreds/master_secret.rs → ...ols/src/domain/anoncreds/master_secret.rs
diff --git a/libvdrtools/src/domain/anoncreds/mod.rs → ...y/libvdrtools/src/domain/anoncreds/mod.rs b/libvdrtools/src/domain/anoncreds/mod.rs → ...y/libvdrtools/src/domain/anoncreds/mod.rs
diff --git a/libvdrtools/src/domain/anoncreds/proof.rs → ...libvdrtools/src/domain/anoncreds/proof.rs b/libvdrtools/src/domain/anoncreds/proof.rs → ...libvdrtools/src/domain/anoncreds/proof.rs
diff --git a/...ols/src/domain/anoncreds/proof_request.rs → ...ols/src/domain/anoncreds/proof_request.rs b/...ols/src/domain/anoncreds/proof_request.rs → ...ols/src/domain/anoncreds/proof_request.rs
diff --git a/.../domain/anoncreds/requested_credential.rs → .../domain/anoncreds/requested_credential.rs b/.../domain/anoncreds/requested_credential.rs → .../domain/anoncreds/requested_credential.rs
diff --git a/...c/domain/anoncreds/revocation_registry.rs → ...c/domain/anoncreds/revocation_registry.rs b/...c/domain/anoncreds/revocation_registry.rs → ...c/domain/anoncreds/revocation_registry.rs
diff --git a/...oncreds/revocation_registry_definition.rs → ...oncreds/revocation_registry_definition.rs b/...oncreds/revocation_registry_definition.rs → ...oncreds/revocation_registry_definition.rs
diff --git a/...in/anoncreds/revocation_registry_delta.rs → ...in/anoncreds/revocation_registry_delta.rs b/...in/anoncreds/revocation_registry_delta.rs → ...in/anoncreds/revocation_registry_delta.rs
diff --git a/libvdrtools/src/domain/anoncreds/schema.rs → ...ibvdrtools/src/domain/anoncreds/schema.rs b/libvdrtools/src/domain/anoncreds/schema.rs → ...ibvdrtools/src/domain/anoncreds/schema.rs
diff --git a/libvdrtools/src/domain/cache.rs → aries/legacy/libvdrtools/src/domain/cache.rs b/libvdrtools/src/domain/cache.rs → aries/legacy/libvdrtools/src/domain/cache.rs
diff --git a/libvdrtools/src/domain/crypto/did.rs → ...gacy/libvdrtools/src/domain/crypto/did.rs b/libvdrtools/src/domain/crypto/did.rs → ...gacy/libvdrtools/src/domain/crypto/did.rs
diff --git a/libvdrtools/src/domain/crypto/key.rs → ...gacy/libvdrtools/src/domain/crypto/key.rs b/libvdrtools/src/domain/crypto/key.rs → ...gacy/libvdrtools/src/domain/crypto/key.rs
diff --git a/libvdrtools/src/domain/crypto/mod.rs → ...gacy/libvdrtools/src/domain/crypto/mod.rs b/libvdrtools/src/domain/crypto/mod.rs → ...gacy/libvdrtools/src/domain/crypto/mod.rs
diff --git a/libvdrtools/src/domain/crypto/pack.rs → ...acy/libvdrtools/src/domain/crypto/pack.rs b/libvdrtools/src/domain/crypto/pack.rs → ...acy/libvdrtools/src/domain/crypto/pack.rs
diff --git a/libvdrtools/src/domain/mod.rs → aries/legacy/libvdrtools/src/domain/mod.rs b/libvdrtools/src/domain/mod.rs → aries/legacy/libvdrtools/src/domain/mod.rs
diff --git a/libvdrtools/src/lib.rs → aries/legacy/libvdrtools/src/lib.rs b/libvdrtools/src/lib.rs → aries/legacy/libvdrtools/src/lib.rs
diff --git a/libvdrtools/src/services/crypto/ed25519.rs → ...ibvdrtools/src/services/crypto/ed25519.rs b/libvdrtools/src/services/crypto/ed25519.rs → ...ibvdrtools/src/services/crypto/ed25519.rs
diff --git a/libvdrtools/src/services/crypto/mod.rs → ...cy/libvdrtools/src/services/crypto/mod.rs b/libvdrtools/src/services/crypto/mod.rs → ...cy/libvdrtools/src/services/crypto/mod.rs
diff --git a/libvdrtools/src/services/mod.rs → aries/legacy/libvdrtools/src/services/mod.rs b/libvdrtools/src/services/mod.rs → aries/legacy/libvdrtools/src/services/mod.rs
diff --git a/libvdrtools/src/services/wallet.rs → ...legacy/libvdrtools/src/services/wallet.rs b/libvdrtools/src/services/wallet.rs → ...legacy/libvdrtools/src/services/wallet.rs
diff --git a/libvdrtools/src/utils/crypto/base58.rs → ...cy/libvdrtools/src/utils/crypto/base58.rs b/libvdrtools/src/utils/crypto/base58.rs → ...cy/libvdrtools/src/utils/crypto/base58.rs
diff --git a/libvdrtools/src/utils/crypto/mod.rs → ...egacy/libvdrtools/src/utils/crypto/mod.rs b/libvdrtools/src/utils/crypto/mod.rs → ...egacy/libvdrtools/src/utils/crypto/mod.rs
diff --git a/...rtools/src/utils/crypto/verkey_builder.rs → ...rtools/src/utils/crypto/verkey_builder.rs b/...rtools/src/utils/crypto/verkey_builder.rs → ...rtools/src/utils/crypto/verkey_builder.rs
diff --git a/libvdrtools/src/utils/mod.rs → aries/legacy/libvdrtools/src/utils/mod.rs b/libvdrtools/src/utils/mod.rs → aries/legacy/libvdrtools/src/utils/mod.rs
diff --git a/libvdrtools/src/utils/qualifier.rs → ...legacy/libvdrtools/src/utils/qualifier.rs b/libvdrtools/src/utils/qualifier.rs → ...legacy/libvdrtools/src/utils/qualifier.rs
diff --git a/public_key/Cargo.toml → aries/public_key/Cargo.toml b/public_key/Cargo.toml → aries/public_key/Cargo.toml
diff --git a/public_key/src/error.rs → aries/public_key/src/error.rs b/public_key/src/error.rs → aries/public_key/src/error.rs
diff --git a/public_key/src/key.rs → aries/public_key/src/key.rs b/public_key/src/key.rs → aries/public_key/src/key.rs
diff --git a/public_key/src/key_type.rs → aries/public_key/src/key_type.rs b/public_key/src/key_type.rs → aries/public_key/src/key_type.rs
diff --git a/public_key/src/lib.rs → aries/public_key/src/lib.rs b/public_key/src/lib.rs → aries/public_key/src/lib.rs
diff --git a/shared_vcx/Cargo.toml → aries/shared_vcx/Cargo.toml b/shared_vcx/Cargo.toml → aries/shared_vcx/Cargo.toml
diff --git a/shared_vcx/src/errors/http_error.rs → aries/shared_vcx/src/errors/http_error.rs b/shared_vcx/src/errors/http_error.rs → aries/shared_vcx/src/errors/http_error.rs
diff --git a/shared_vcx/src/errors/mod.rs → aries/shared_vcx/src/errors/mod.rs b/shared_vcx/src/errors/mod.rs → aries/shared_vcx/src/errors/mod.rs
diff --git a/shared_vcx/src/errors/validation.rs → aries/shared_vcx/src/errors/validation.rs b/shared_vcx/src/errors/validation.rs → aries/shared_vcx/src/errors/validation.rs
diff --git a/shared_vcx/src/http_client.rs → aries/shared_vcx/src/http_client.rs b/shared_vcx/src/http_client.rs → aries/shared_vcx/src/http_client.rs
diff --git a/shared_vcx/src/lib.rs → aries/shared_vcx/src/lib.rs b/shared_vcx/src/lib.rs → aries/shared_vcx/src/lib.rs
diff --git a/shared_vcx/src/maybe_known.rs → aries/shared_vcx/src/maybe_known.rs b/shared_vcx/src/maybe_known.rs → aries/shared_vcx/src/maybe_known.rs
diff --git a/shared_vcx/src/misc/mod.rs → aries/shared_vcx/src/misc/mod.rs b/shared_vcx/src/misc/mod.rs → aries/shared_vcx/src/misc/mod.rs
diff --git a/shared_vcx/src/misc/serde_ignored.rs → aries/shared_vcx/src/misc/serde_ignored.rs b/shared_vcx/src/misc/serde_ignored.rs → aries/shared_vcx/src/misc/serde_ignored.rs
diff --git a/shared_vcx/src/misc/utils.rs → aries/shared_vcx/src/misc/utils.rs b/shared_vcx/src/misc/utils.rs → aries/shared_vcx/src/misc/utils.rs
diff --git a/shared_vcx/src/validation/did.rs → aries/shared_vcx/src/validation/did.rs b/shared_vcx/src/validation/did.rs → aries/shared_vcx/src/validation/did.rs
diff --git a/shared_vcx/src/validation/mod.rs → aries/shared_vcx/src/validation/mod.rs b/shared_vcx/src/validation/mod.rs → aries/shared_vcx/src/validation/mod.rs
diff --git a/shared_vcx/src/validation/verkey.rs → aries/shared_vcx/src/validation/verkey.rs b/shared_vcx/src/validation/verkey.rs → aries/shared_vcx/src/validation/verkey.rs
diff --git a/wrappers/node/.eslintignore → aries/wrappers/node/.eslintignore b/wrappers/node/.eslintignore → aries/wrappers/node/.eslintignore
diff --git a/wrappers/node/.eslintrc.js → aries/wrappers/node/.eslintrc.js b/wrappers/node/.eslintrc.js → aries/wrappers/node/.eslintrc.js
diff --git a/wrappers/node/.gitignore → aries/wrappers/node/.gitignore b/wrappers/node/.gitignore → aries/wrappers/node/.gitignore
diff --git a/wrappers/node/.npmignore → aries/wrappers/node/.npmignore b/wrappers/node/.npmignore → aries/wrappers/node/.npmignore
diff --git a/wrappers/node/.prettierrc.js → aries/wrappers/node/.prettierrc.js b/wrappers/node/.prettierrc.js → aries/wrappers/node/.prettierrc.js
diff --git a/wrappers/node/README.md → aries/wrappers/node/README.md b/wrappers/node/README.md → aries/wrappers/node/README.md
diff --git a/wrappers/node/ci/generate-docs.sh → aries/wrappers/node/ci/generate-docs.sh b/wrappers/node/ci/generate-docs.sh → aries/wrappers/node/ci/generate-docs.sh
diff --git a/wrappers/node/ci/node.dockerfile → aries/wrappers/node/ci/node.dockerfile b/wrappers/node/ci/node.dockerfile → aries/wrappers/node/ci/node.dockerfile
@@ -1,11 +1,11 @@
-# Development 
+# Development
 FROM libindy
 ARG uid=1000
 RUN useradd -ms /bin/bash -u $uid node
 
-WORKDIR vcx/wrappers/node
+WORKDIR vcx/aries/wrappers/node
 # Assumes we are in the ./vcx directory
 RUN npm i [email protected]
 COPY vcx/libvcx/target/debian/*.deb .
 RUN dpkg -i *.deb
-USER node
+USER node
diff --git a/wrappers/node/ci/package.sh → aries/wrappers/node/ci/package.sh b/wrappers/node/ci/package.sh → aries/wrappers/node/ci/package.sh
@@ -1,6 +1,6 @@
 export PATH=${PATH}:$(pwd)/vcx/ci/scripts
 OUTPUTDIR=output
-DIR=vcx/wrappers/node
+DIR=vcx/aries/wrappers/node
 CURDIR=$(pwd)
 cd $DIR
 npm i

diff --git a/wrappers/node/ci/test-and-package.sh → aries/wrappers/node/ci/test-and-package.sh b/wrappers/node/ci/test-and-package.sh → aries/wrappers/node/ci/test-and-package.sh
diff --git a/wrappers/node/ci/test.sh → aries/wrappers/node/ci/test.sh b/wrappers/node/ci/test.sh → aries/wrappers/node/ci/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-cd vcx/wrappers/node/
+cd vcx/aries/wrappers/node/
 npm i
 npm run lint
 npm run compile
 npm test
-npm run test-logging
+npm run test-logging
diff --git a/wrappers/node/ci/test_wrapper.sh → aries/wrappers/node/ci/test_wrapper.sh b/wrappers/node/ci/test_wrapper.sh → aries/wrappers/node/ci/test_wrapper.sh
diff --git a/wrappers/node/notification-server.js → aries/wrappers/node/notification-server.js b/wrappers/node/notification-server.js → aries/wrappers/node/notification-server.js
diff --git a/wrappers/node/package-lock.json → aries/wrappers/node/package-lock.json b/wrappers/node/package-lock.json → aries/wrappers/node/package-lock.json
diff --git a/wrappers/node/package.json → aries/wrappers/node/package.json b/wrappers/node/package.json → aries/wrappers/node/package.json
diff --git a/wrappers/node/publish.sh → aries/wrappers/node/publish.sh b/wrappers/node/publish.sh → aries/wrappers/node/publish.sh
diff --git a/wrappers/node/resources/localhost.txn → aries/wrappers/node/resources/localhost.txn b/wrappers/node/resources/localhost.txn → aries/wrappers/node/resources/localhost.txn
diff --git a/wrappers/node/src/api/common.ts → aries/wrappers/node/src/api/common.ts b/wrappers/node/src/api/common.ts → aries/wrappers/node/src/api/common.ts
diff --git a/wrappers/node/src/api/connection.ts → aries/wrappers/node/src/api/connection.ts b/wrappers/node/src/api/connection.ts → aries/wrappers/node/src/api/connection.ts
diff --git a/wrappers/node/src/api/credential-def.ts → ...s/wrappers/node/src/api/credential-def.ts b/wrappers/node/src/api/credential-def.ts → ...s/wrappers/node/src/api/credential-def.ts
diff --git a/wrappers/node/src/api/credential.ts → aries/wrappers/node/src/api/credential.ts b/wrappers/node/src/api/credential.ts → aries/wrappers/node/src/api/credential.ts
diff --git a/wrappers/node/src/api/disclosed-proof.ts → .../wrappers/node/src/api/disclosed-proof.ts b/wrappers/node/src/api/disclosed-proof.ts → .../wrappers/node/src/api/disclosed-proof.ts
diff --git a/wrappers/node/src/api/init.ts → aries/wrappers/node/src/api/init.ts b/wrappers/node/src/api/init.ts → aries/wrappers/node/src/api/init.ts
diff --git a/wrappers/node/src/api/issuer-credential.ts → ...rappers/node/src/api/issuer-credential.ts b/wrappers/node/src/api/issuer-credential.ts → ...rappers/node/src/api/issuer-credential.ts
diff --git a/wrappers/node/src/api/logging.ts → aries/wrappers/node/src/api/logging.ts b/wrappers/node/src/api/logging.ts → aries/wrappers/node/src/api/logging.ts
diff --git a/wrappers/node/src/api/mediated-connection.ts → ...ppers/node/src/api/mediated-connection.ts b/wrappers/node/src/api/mediated-connection.ts → ...ppers/node/src/api/mediated-connection.ts
diff --git a/...pers/node/src/api/out-of-band-receiver.ts → ...pers/node/src/api/out-of-band-receiver.ts b/...pers/node/src/api/out-of-band-receiver.ts → ...pers/node/src/api/out-of-band-receiver.ts
diff --git a/wrappers/node/src/api/out-of-band-sender.ts → ...appers/node/src/api/out-of-band-sender.ts b/wrappers/node/src/api/out-of-band-sender.ts → ...appers/node/src/api/out-of-band-sender.ts
diff --git a/wrappers/node/src/api/out-of-band.ts → aries/wrappers/node/src/api/out-of-band.ts b/wrappers/node/src/api/out-of-band.ts → aries/wrappers/node/src/api/out-of-band.ts
diff --git a/wrappers/node/src/api/proof.ts → aries/wrappers/node/src/api/proof.ts b/wrappers/node/src/api/proof.ts → aries/wrappers/node/src/api/proof.ts
diff --git a/wrappers/node/src/api/revocation-registry.ts → ...ppers/node/src/api/revocation-registry.ts b/wrappers/node/src/api/revocation-registry.ts → ...ppers/node/src/api/revocation-registry.ts
diff --git a/wrappers/node/src/api/schema.ts → aries/wrappers/node/src/api/schema.ts b/wrappers/node/src/api/schema.ts → aries/wrappers/node/src/api/schema.ts
diff --git a/wrappers/node/src/api/trustping.ts → aries/wrappers/node/src/api/trustping.ts b/wrappers/node/src/api/trustping.ts → aries/wrappers/node/src/api/trustping.ts
diff --git a/wrappers/node/src/api/utils.ts → aries/wrappers/node/src/api/utils.ts b/wrappers/node/src/api/utils.ts → aries/wrappers/node/src/api/utils.ts
diff --git a/wrappers/node/src/api/vcx-base-with-state.ts → ...ppers/node/src/api/vcx-base-with-state.ts b/wrappers/node/src/api/vcx-base-with-state.ts → ...ppers/node/src/api/vcx-base-with-state.ts
diff --git a/wrappers/node/src/api/vcx-base.ts → aries/wrappers/node/src/api/vcx-base.ts b/wrappers/node/src/api/vcx-base.ts → aries/wrappers/node/src/api/vcx-base.ts
diff --git a/wrappers/node/src/api/vcx-mock.ts → aries/wrappers/node/src/api/vcx-mock.ts b/wrappers/node/src/api/vcx-mock.ts → aries/wrappers/node/src/api/vcx-mock.ts
diff --git a/wrappers/node/src/api/wallet.ts → aries/wrappers/node/src/api/wallet.ts b/wrappers/node/src/api/wallet.ts → aries/wrappers/node/src/api/wallet.ts
diff --git a/wrappers/node/src/errors.ts → aries/wrappers/node/src/errors.ts b/wrappers/node/src/errors.ts → aries/wrappers/node/src/errors.ts
diff --git a/wrappers/node/src/index.ts → aries/wrappers/node/src/index.ts b/wrappers/node/src/index.ts → aries/wrappers/node/src/index.ts
diff --git a/wrappers/node/src/rustlib.ts → aries/wrappers/node/src/rustlib.ts b/wrappers/node/src/rustlib.ts → aries/wrappers/node/src/rustlib.ts
diff --git a/wrappers/node/src/utils/gc-watcher.ts → aries/wrappers/node/src/utils/gc-watcher.ts b/wrappers/node/src/utils/gc-watcher.ts → aries/wrappers/node/src/utils/gc-watcher.ts
diff --git a/wrappers/node/test/.eslintrc.js → aries/wrappers/node/test/.eslintrc.js b/wrappers/node/test/.eslintrc.js → aries/wrappers/node/test/.eslintrc.js
diff --git a/wrappers/node/test/helpers/entities.ts → aries/wrappers/node/test/helpers/entities.ts b/wrappers/node/test/helpers/entities.ts → aries/wrappers/node/test/helpers/entities.ts
diff --git a/wrappers/node/test/helpers/mockdata.ts → aries/wrappers/node/test/helpers/mockdata.ts b/wrappers/node/test/helpers/mockdata.ts → aries/wrappers/node/test/helpers/mockdata.ts
diff --git a/wrappers/node/test/helpers/utils.ts → aries/wrappers/node/test/helpers/utils.ts b/wrappers/node/test/helpers/utils.ts → aries/wrappers/node/test/helpers/utils.ts
diff --git a/...pers/node/test/integration/ledger.test.ts → ...pers/node/test/integration/ledger.test.ts b/...pers/node/test/integration/ledger.test.ts → ...pers/node/test/integration/ledger.test.ts
diff --git a/wrappers/node/test/module-resolver-helper.ts → ...ppers/node/test/module-resolver-helper.ts b/wrappers/node/test/module-resolver-helper.ts → ...ppers/node/test/module-resolver-helper.ts
diff --git a/...e/test/suite1/ariesvcx-connection.test.ts → ...e/test/suite1/ariesvcx-connection.test.ts b/...e/test/suite1/ariesvcx-connection.test.ts → ...e/test/suite1/ariesvcx-connection.test.ts
diff --git a/...st/suite1/ariesvcx-credential-def.test.ts → ...st/suite1/ariesvcx-credential-def.test.ts b/...st/suite1/ariesvcx-credential-def.test.ts → ...st/suite1/ariesvcx-credential-def.test.ts
diff --git a/...e/test/suite1/ariesvcx-credential.test.ts → ...e/test/suite1/ariesvcx-credential.test.ts b/...e/test/suite1/ariesvcx-credential.test.ts → ...e/test/suite1/ariesvcx-credential.test.ts
diff --git a/...t/suite1/ariesvcx-disclosed-proof.test.ts → ...t/suite1/ariesvcx-disclosed-proof.test.ts b/...t/suite1/ariesvcx-disclosed-proof.test.ts → ...t/suite1/ariesvcx-disclosed-proof.test.ts
diff --git a/...suite1/ariesvcx-issuer-credential.test.ts → ...suite1/ariesvcx-issuer-credential.test.ts b/...suite1/ariesvcx-issuer-credential.test.ts → ...suite1/ariesvcx-issuer-credential.test.ts
diff --git a/...ite1/ariesvcx-mediated-connection.test.ts → ...ite1/ariesvcx-mediated-connection.test.ts b/...ite1/ariesvcx-mediated-connection.test.ts → ...ite1/ariesvcx-mediated-connection.test.ts
diff --git a/...ers/node/test/suite1/ariesvcx-oob.test.ts → ...ers/node/test/suite1/ariesvcx-oob.test.ts b/...ers/node/test/suite1/ariesvcx-oob.test.ts → ...ers/node/test/suite1/ariesvcx-oob.test.ts
diff --git a/...s/node/test/suite1/ariesvcx-proof.test.ts → ...s/node/test/suite1/ariesvcx-proof.test.ts b/...s/node/test/suite1/ariesvcx-proof.test.ts → ...s/node/test/suite1/ariesvcx-proof.test.ts
diff --git a/.../node/test/suite1/ariesvcx-schema.test.ts → .../node/test/suite1/ariesvcx-schema.test.ts b/.../node/test/suite1/ariesvcx-schema.test.ts → .../node/test/suite1/ariesvcx-schema.test.ts
diff --git a/...s/node/test/suite1/ariesvcx-utils.test.ts → ...s/node/test/suite1/ariesvcx-utils.test.ts b/...s/node/test/suite1/ariesvcx-utils.test.ts → ...s/node/test/suite1/ariesvcx-utils.test.ts
diff --git a/.../node/test/suite1/ariesvcx-wallet.test.ts → .../node/test/suite1/ariesvcx-wallet.test.ts b/.../node/test/suite1/ariesvcx-wallet.test.ts → .../node/test/suite1/ariesvcx-wallet.test.ts
diff --git a/wrappers/node/test/tsconfig.json → aries/wrappers/node/test/tsconfig.json b/wrappers/node/test/tsconfig.json → aries/wrappers/node/test/tsconfig.json
diff --git a/wrappers/node/tsconfig.json → aries/wrappers/node/tsconfig.json b/wrappers/node/tsconfig.json → aries/wrappers/node/tsconfig.json
diff --git a/wrappers/vcx-napi-rs/Cargo.toml → aries/wrappers/vcx-napi-rs/Cargo.toml b/wrappers/vcx-napi-rs/Cargo.toml → aries/wrappers/vcx-napi-rs/Cargo.toml
@@ -12,14 +12,14 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-libvcx_core = { path = "../../libvcx_core"  }
-wallet_migrator = { path = "../../wallet_migrator" }
+libvcx_core = { path = "../../legacy/libvcx_core" }
+wallet_migrator = { path = "../../../tools/wallet_migrator" }
 log = "0.4.16"
 napi = { version = "2.10.14", default-features = false, features = [ "async" ] }
 napi-derive = { version = "2.10.1" }
 uuid = { version = "1.5.0", default-features = false, features = ["v4"] }
 chrono = "0.4.23"
-libvcx_logger = { path = "../../tools/libvcx_logger" }
+libvcx_logger = { path = "../../../tools/libvcx_logger" }
 
 [build-dependencies]
 napi-build = "2.0.1"
diff --git a/wrappers/vcx-napi-rs/alpine.Dockerfile → aries/wrappers/vcx-napi-rs/alpine.Dockerfile b/wrappers/vcx-napi-rs/alpine.Dockerfile → aries/wrappers/vcx-napi-rs/alpine.Dockerfile
diff --git a/wrappers/vcx-napi-rs/build.rs → aries/wrappers/vcx-napi-rs/build.rs b/wrappers/vcx-napi-rs/build.rs → aries/wrappers/vcx-napi-rs/build.rs
diff --git a/wrappers/vcx-napi-rs/debian.Dockerfile → aries/wrappers/vcx-napi-rs/debian.Dockerfile b/wrappers/vcx-napi-rs/debian.Dockerfile → aries/wrappers/vcx-napi-rs/debian.Dockerfile
diff --git a/wrappers/vcx-napi-rs/index.d.ts → aries/wrappers/vcx-napi-rs/index.d.ts b/wrappers/vcx-napi-rs/index.d.ts → aries/wrappers/vcx-napi-rs/index.d.ts
diff --git a/wrappers/vcx-napi-rs/index.js → aries/wrappers/vcx-napi-rs/index.js b/wrappers/vcx-napi-rs/index.js → aries/wrappers/vcx-napi-rs/index.js
diff --git a/...rs/vcx-napi-rs/npm/darwin-arm64/README.md → ...rs/vcx-napi-rs/npm/darwin-arm64/README.md b/...rs/vcx-napi-rs/npm/darwin-arm64/README.md → ...rs/vcx-napi-rs/npm/darwin-arm64/README.md
diff --git a/...vcx-napi-rs/npm/darwin-arm64/package.json → ...vcx-napi-rs/npm/darwin-arm64/package.json b/...vcx-napi-rs/npm/darwin-arm64/package.json → ...vcx-napi-rs/npm/darwin-arm64/package.json
diff --git a/...pers/vcx-napi-rs/npm/darwin-x64/README.md → ...pers/vcx-napi-rs/npm/darwin-x64/README.md b/...pers/vcx-napi-rs/npm/darwin-x64/README.md → ...pers/vcx-napi-rs/npm/darwin-x64/README.md
diff --git a/...s/vcx-napi-rs/npm/darwin-x64/package.json → ...s/vcx-napi-rs/npm/darwin-x64/package.json b/...s/vcx-napi-rs/npm/darwin-x64/package.json → ...s/vcx-napi-rs/npm/darwin-x64/package.json
diff --git a/...s/vcx-napi-rs/npm/linux-x64-gnu/README.md → ...s/vcx-napi-rs/npm/linux-x64-gnu/README.md b/...s/vcx-napi-rs/npm/linux-x64-gnu/README.md → ...s/vcx-napi-rs/npm/linux-x64-gnu/README.md
diff --git a/...cx-napi-rs/npm/linux-x64-gnu/package.json → ...cx-napi-rs/npm/linux-x64-gnu/package.json b/...cx-napi-rs/npm/linux-x64-gnu/package.json → ...cx-napi-rs/npm/linux-x64-gnu/package.json
diff --git a/.../vcx-napi-rs/npm/linux-x64-musl/README.md → .../vcx-napi-rs/npm/linux-x64-musl/README.md b/.../vcx-napi-rs/npm/linux-x64-musl/README.md → .../vcx-napi-rs/npm/linux-x64-musl/README.md
diff --git a/...x-napi-rs/npm/linux-x64-musl/package.json → ...x-napi-rs/npm/linux-x64-musl/package.json b/...x-napi-rs/npm/linux-x64-musl/package.json → ...x-napi-rs/npm/linux-x64-musl/package.json
diff --git a/wrappers/vcx-napi-rs/package-lock.json → aries/wrappers/vcx-napi-rs/package-lock.json b/wrappers/vcx-napi-rs/package-lock.json → aries/wrappers/vcx-napi-rs/package-lock.json
diff --git a/wrappers/vcx-napi-rs/package.json → aries/wrappers/vcx-napi-rs/package.json b/wrappers/vcx-napi-rs/package.json → aries/wrappers/vcx-napi-rs/package.json
diff --git a/...pers/vcx-napi-rs/src/api/agency_client.rs → ...pers/vcx-napi-rs/src/api/agency_client.rs b/...pers/vcx-napi-rs/src/api/agency_client.rs → ...pers/vcx-napi-rs/src/api/agency_client.rs
diff --git a/wrappers/vcx-napi-rs/src/api/agent.rs → aries/wrappers/vcx-napi-rs/src/api/agent.rs b/wrappers/vcx-napi-rs/src/api/agent.rs → aries/wrappers/vcx-napi-rs/src/api/agent.rs
diff --git a/wrappers/vcx-napi-rs/src/api/connection.rs → ...rappers/vcx-napi-rs/src/api/connection.rs b/wrappers/vcx-napi-rs/src/api/connection.rs → ...rappers/vcx-napi-rs/src/api/connection.rs
diff --git a/wrappers/vcx-napi-rs/src/api/credential.rs → ...rappers/vcx-napi-rs/src/api/credential.rs b/wrappers/vcx-napi-rs/src/api/credential.rs → ...rappers/vcx-napi-rs/src/api/credential.rs
diff --git a/...-napi-rs/src/api/credential_definition.rs → ...-napi-rs/src/api/credential_definition.rs b/...-napi-rs/src/api/credential_definition.rs → ...-napi-rs/src/api/credential_definition.rs
diff --git a/...rs/vcx-napi-rs/src/api/disclosed_proof.rs → ...rs/vcx-napi-rs/src/api/disclosed_proof.rs b/...rs/vcx-napi-rs/src/api/disclosed_proof.rs → ...rs/vcx-napi-rs/src/api/disclosed_proof.rs
diff --git a/.../vcx-napi-rs/src/api/issuer_credential.rs → .../vcx-napi-rs/src/api/issuer_credential.rs b/.../vcx-napi-rs/src/api/issuer_credential.rs → .../vcx-napi-rs/src/api/issuer_credential.rs
diff --git a/wrappers/vcx-napi-rs/src/api/ledger.rs → aries/wrappers/vcx-napi-rs/src/api/ledger.rs b/wrappers/vcx-napi-rs/src/api/ledger.rs → aries/wrappers/vcx-napi-rs/src/api/ledger.rs
diff --git a/wrappers/vcx-napi-rs/src/api/logging.rs → ...s/wrappers/vcx-napi-rs/src/api/logging.rs b/wrappers/vcx-napi-rs/src/api/logging.rs → ...s/wrappers/vcx-napi-rs/src/api/logging.rs
diff --git a/...cx-napi-rs/src/api/mediated_connection.rs → ...cx-napi-rs/src/api/mediated_connection.rs b/...cx-napi-rs/src/api/mediated_connection.rs → ...cx-napi-rs/src/api/mediated_connection.rs
diff --git a/wrappers/vcx-napi-rs/src/api/mod.rs → aries/wrappers/vcx-napi-rs/src/api/mod.rs b/wrappers/vcx-napi-rs/src/api/mod.rs → aries/wrappers/vcx-napi-rs/src/api/mod.rs
diff --git a/wrappers/vcx-napi-rs/src/api/out_of_band.rs → ...appers/vcx-napi-rs/src/api/out_of_band.rs b/wrappers/vcx-napi-rs/src/api/out_of_band.rs → ...appers/vcx-napi-rs/src/api/out_of_band.rs
diff --git a/...x-napi-rs/src/api/out_of_band_receiver.rs → ...x-napi-rs/src/api/out_of_band_receiver.rs b/...x-napi-rs/src/api/out_of_band_receiver.rs → ...x-napi-rs/src/api/out_of_band_receiver.rs
diff --git a/...vcx-napi-rs/src/api/out_of_band_sender.rs → ...vcx-napi-rs/src/api/out_of_band_sender.rs b/...vcx-napi-rs/src/api/out_of_band_sender.rs → ...vcx-napi-rs/src/api/out_of_band_sender.rs
diff --git a/wrappers/vcx-napi-rs/src/api/pool.rs → aries/wrappers/vcx-napi-rs/src/api/pool.rs b/wrappers/vcx-napi-rs/src/api/pool.rs → aries/wrappers/vcx-napi-rs/src/api/pool.rs
diff --git a/wrappers/vcx-napi-rs/src/api/proof.rs → aries/wrappers/vcx-napi-rs/src/api/proof.rs b/wrappers/vcx-napi-rs/src/api/proof.rs → aries/wrappers/vcx-napi-rs/src/api/proof.rs
diff --git a/...cx-napi-rs/src/api/revocation_registry.rs → ...cx-napi-rs/src/api/revocation_registry.rs b/...cx-napi-rs/src/api/revocation_registry.rs → ...cx-napi-rs/src/api/revocation_registry.rs