diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 37aa1828a1..fb2145ebea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -171,8 +171,6 @@ jobs:
         run: |
           cd did_resolver_sov
           cargo check
-          cargo check --features vdrtools --no-default-features
-          cargo check --features modular_libs --no-default-features
 
   check-aries-vcx-feature-variants:
     runs-on: ubuntu-20.04
@@ -191,11 +189,11 @@ jobs:
       - name: "Verify aries_vcx compiles with different dependency feature variants"
         run: |
           cd aries_vcx
-          cargo check
+          cargo check --no-default-features
           cargo check --tests --all-features
-          cargo check --features vdrtools
-          cargo check --features modular_libs
-          cargo check --features vdr_proxy_ledger
+          cargo check --features vdrtools --no-default-features
+          cargo check --features modular_libs --no-default-features
+          cargo check --features vdr_proxy_ledger --no-default-features
 
   ##########################################################################################
   ##############################   DOCKER BUILD   ##########################################
diff --git a/Cargo.lock b/Cargo.lock
index f4f81024c4..0914b15788 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -449,6 +449,7 @@ dependencies = [
  "async-trait",
  "derive_builder 0.12.0",
  "futures",
+ "indy-api-types",
  "indy-credx",
  "indy-ledger-response-parser",
  "indy-vdr",
diff --git a/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs b/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
index 35efa8d211..2ec5b3171c 100644
--- a/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
+++ b/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use aries_vcx::agency_client::agency_client::AgencyClient;
 use aries_vcx::core::profile::profile::Profile;
-use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 use crate::agent::agent_config::AgentConfig;
 
diff --git a/agents/rust/aries-vcx-agent/src/services/mediated_connection.rs b/agents/rust/aries-vcx-agent/src/services/mediated_connection.rs
index 012d2dace9..998dd12ee9 100644
--- a/agents/rust/aries-vcx-agent/src/services/mediated_connection.rs
+++ b/agents/rust/aries-vcx-agent/src/services/mediated_connection.rs
@@ -17,7 +17,7 @@ use aries_vcx::{
     agency_client::{agency_client::AgencyClient, configuration::AgencyClientConfig},
     handlers::connection::mediated_connection::{ConnectionState, MediatedConnection},
 };
-use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 pub struct ServiceMediatedConnections {
     profile: Arc<dyn Profile>,
diff --git a/aries_vcx/Cargo.toml b/aries_vcx/Cargo.toml
index aaf159363c..0b5398ae6a 100644
--- a/aries_vcx/Cargo.toml
+++ b/aries_vcx/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 
 [features]
 default = ["vdrtools"]
-vdrtools = ["aries_vcx_core/vdrtools"]
+vdrtools = ["aries_vcx_core/vdrtools_anoncreds", "aries_vcx_core/vdrtools_ledger", "aries_vcx_core/vdrtools_wallet"]
 # Feature flag to include the 'modular library' dependencies (vdrtools alternatives; indy-vdr, indy-credx)
 modular_libs = ["aries_vcx_core/modular_libs"]
 # TODO: Remove using "vdrtools" feature flag for vdr_proxy_ledger once IndyCredxAnonCreds
diff --git a/aries_vcx/src/handlers/connection/cloud_agent.rs b/aries_vcx/src/handlers/connection/cloud_agent.rs
index c112ee00e2..7f689b0c87 100644
--- a/aries_vcx/src/handlers/connection/cloud_agent.rs
+++ b/aries_vcx/src/handlers/connection/cloud_agent.rs
@@ -7,7 +7,7 @@ use agency_client::agency_client::AgencyClient;
 use agency_client::api::downloaded_message::DownloadedMessageEncrypted;
 use agency_client::messages::update_message::UIDsByConn;
 use agency_client::wallet::base_agency_client_wallet::BaseAgencyClientWallet;
-use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseWallet;
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseWallet;
 use messages::AriesMessage;
 
 use crate::agency_client::MessageStatusCode;
diff --git a/aries_vcx/src/protocols/connection/generic/mod.rs b/aries_vcx/src/protocols/connection/generic/mod.rs
index ade663676f..4312d263de 100644
--- a/aries_vcx/src/protocols/connection/generic/mod.rs
+++ b/aries_vcx/src/protocols/connection/generic/mod.rs
@@ -229,8 +229,8 @@ mod connection_serde_tests {
     use crate::protocols::connection::{invitee::InviteeConnection, inviter::InviterConnection, Connection};
     use crate::utils::mockdata::profile::mock_ledger::MockLedger;
     use crate::utils::mockdata::profile::mock_profile::MockProfile;
-    use crate::utils::mockdata::profile::mock_wallet::MockWallet;
     use aries_vcx_core::ledger::base_ledger::IndyLedgerRead;
+    use aries_vcx_core::wallet::mock_wallet::MockWallet;
     use std::sync::Arc;
 
     impl<'a> From<RefInviteeState<'a>> for InviteeState {
diff --git a/aries_vcx/src/utils/mockdata/profile/mock_profile.rs b/aries_vcx/src/utils/mockdata/profile/mock_profile.rs
index 9d479afd6c..f1c89c233f 100644
--- a/aries_vcx/src/utils/mockdata/profile/mock_profile.rs
+++ b/aries_vcx/src/utils/mockdata/profile/mock_profile.rs
@@ -5,9 +5,10 @@ use aries_vcx_core::{
     anoncreds::base_anoncreds::BaseAnonCreds,
     ledger::base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite, IndyLedgerRead, IndyLedgerWrite},
     wallet::base_wallet::BaseWallet,
+    wallet::mock_wallet::MockWallet,
 };
 
-use super::{mock_anoncreds::MockAnoncreds, mock_ledger::MockLedger, mock_wallet::MockWallet};
+use super::{mock_anoncreds::MockAnoncreds, mock_ledger::MockLedger};
 use crate::core::profile::profile::Profile;
 use crate::errors::error::VcxResult;
 use async_trait::async_trait;
diff --git a/aries_vcx/src/utils/mockdata/profile/mod.rs b/aries_vcx/src/utils/mockdata/profile/mod.rs
index dd4cfb7d97..704a0287e5 100644
--- a/aries_vcx/src/utils/mockdata/profile/mod.rs
+++ b/aries_vcx/src/utils/mockdata/profile/mod.rs
@@ -1,4 +1,3 @@
 pub mod mock_anoncreds;
 pub mod mock_ledger;
 pub mod mock_profile;
-pub mod mock_wallet;
diff --git a/aries_vcx/src/utils/mod.rs b/aries_vcx/src/utils/mod.rs
index 6bea2ea9b5..72a6debe02 100644
--- a/aries_vcx/src/utils/mod.rs
+++ b/aries_vcx/src/utils/mod.rs
@@ -47,6 +47,7 @@ pub mod constants;
 pub mod file;
 pub mod mockdata;
 pub mod openssl;
+#[cfg(feature = "vdrtools")]
 pub mod provision;
 pub mod qualifier;
 pub mod random;
diff --git a/aries_vcx/src/utils/provision.rs b/aries_vcx/src/utils/provision.rs
index 29585d628e..8b1e2698ee 100644
--- a/aries_vcx/src/utils/provision.rs
+++ b/aries_vcx/src/utils/provision.rs
@@ -2,8 +2,8 @@ use std::sync::Arc;
 
 use agency_client::agency_client::AgencyClient;
 use agency_client::configuration::{AgencyClientConfig, AgentProvisionConfig};
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
 
 use crate::errors::error::prelude::*;
 
diff --git a/aries_vcx/tests/test_agency.rs b/aries_vcx/tests/test_agency.rs
index 1d068935e6..51b610c766 100644
--- a/aries_vcx/tests/test_agency.rs
+++ b/aries_vcx/tests/test_agency.rs
@@ -16,7 +16,7 @@ mod integration_tests {
     use agency_client::MessageStatusCode;
     use aries_vcx::global::settings;
     use aries_vcx::utils::devsetup::SetupPoolDirectory;
-    use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
+    use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
     use aries_vcx_core::wallet::indy::wallet::create_and_open_wallet;
     use aries_vcx_core::wallet::indy::{IndySdkWallet, WalletConfig};
     use messages::msg_fields::protocols::cred_issuance::offer_credential::OfferCredentialDecorators;
diff --git a/aries_vcx/tests/utils/migration.rs b/aries_vcx/tests/utils/migration.rs
index 4915fe5727..5d5424974e 100644
--- a/aries_vcx/tests/utils/migration.rs
+++ b/aries_vcx/tests/utils/migration.rs
@@ -8,7 +8,7 @@ use aries_vcx::{
     core::profile::modular_libs_profile::ModularLibsProfile, global::settings::WALLET_KDF_RAW,
     utils::devsetup::SetupProfile,
 };
-use aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 use aries_vcx_core::wallet::indy::wallet::create_and_open_wallet;
 use aries_vcx_core::wallet::indy::IndySdkWallet;
 use aries_vcx_core::wallet::indy::WalletConfig;
diff --git a/aries_vcx_core/Cargo.toml b/aries_vcx_core/Cargo.toml
index b958c5c7eb..5bd51ddebd 100644
--- a/aries_vcx_core/Cargo.toml
+++ b/aries_vcx_core/Cargo.toml
@@ -6,7 +6,9 @@ edition = "2021"
 [features]
 ########################## DEP FLAGS ################################
 # Feature flag to include the libvdrtools dependency
-vdrtools = ["dep:libvdrtools"]
+vdrtools_anoncreds = ["dep:libvdrtools"]
+vdrtools_wallet = ["dep:libvdrtools"]
+vdrtools_ledger = ["dep:libvdrtools"]
 # Feature flag to include the 'modular library' dependencies (vdrtools alternatives; indy-vdr, indy-credx)
 modular_libs = ["dep:indy-vdr", "dep:indy-credx", "dep:indy-ledger-response-parser", "dep:lru"]
 vdr_proxy_ledger = ["modular_libs", "dep:indy-vdr-proxy-client"]
@@ -28,6 +30,7 @@ indy-vdr = { version = "0.3.4", default-features = false, features = ["ffi", "lo
 # - update libvdrtools to use =0.3.6 ursa
 indy-credx = { git = "https://github.com/anonyome/indy-shared-rs.git", rev = "7342bc624d23ece8845d1a701cd2cdc9cd401bb0", optional = true }
 libvdrtools = { path = "../libvdrtools", optional = true }
+indy-api-types = { path = "../libvdrtools/indy-api-types" }
 async-trait = "0.1.68"
 futures = { version = "0.3", default-features = false }
 serde_json = "1.0.95"
diff --git a/aries_vcx_core/src/anoncreds/mod.rs b/aries_vcx_core/src/anoncreds/mod.rs
index 42c5906c9b..744331e109 100644
--- a/aries_vcx_core/src/anoncreds/mod.rs
+++ b/aries_vcx_core/src/anoncreds/mod.rs
@@ -3,7 +3,7 @@ pub mod base_anoncreds;
 #[cfg(any(feature = "modular_libs", feature = "vdr_proxy_ledger"))]
 pub mod credx_anoncreds;
 
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_anoncreds")]
 pub mod indy;
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_anoncreds")]
 pub mod indy_anoncreds;
diff --git a/aries_vcx_core/src/errors/mapping_vdrtools.rs b/aries_vcx_core/src/errors/mapping_indy_api_types.rs
similarity index 88%
rename from aries_vcx_core/src/errors/mapping_vdrtools.rs
rename to aries_vcx_core/src/errors/mapping_indy_api_types.rs
index 66fc281de0..5740e383f2 100644
--- a/aries_vcx_core/src/errors/mapping_vdrtools.rs
+++ b/aries_vcx_core/src/errors/mapping_indy_api_types.rs
@@ -1,16 +1,8 @@
-#[cfg(feature = "vdrtools")]
-use vdrtools::types::{
-    errors::{IndyError, IndyErrorKind},
-    ErrorCode,
-};
+pub use indy_api_types::{errors, ErrorCode};
 
-#[cfg(all(
-    not(feature = "vdrtools"),
-    any(feature = "modular_libs", feature = "vdr_proxy_ledger")
-))]
-use indy_ledger_response_parser::{
-    errors::{IndyError, IndyErrorKind},
-    ErrorCode,
+use indy_api_types::{
+    errors::{err_msg, IndyErrorKind, IndyResult, IndyResultExt},
+    IndyError,
 };
 
 use crate::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind};
diff --git a/aries_vcx_core/src/errors/mod.rs b/aries_vcx_core/src/errors/mod.rs
index 7ce3175ba5..201663e804 100644
--- a/aries_vcx_core/src/errors/mod.rs
+++ b/aries_vcx_core/src/errors/mod.rs
@@ -2,10 +2,9 @@ pub mod error;
 mod mapping_agency_client;
 #[cfg(any(feature = "modular_libs", feature = "vdr_proxy_ledger"))]
 mod mapping_credx;
+mod mapping_indy_api_types;
 #[cfg(any(feature = "modular_libs", feature = "vdr_proxy_ledger"))]
 mod mapping_indyvdr;
 #[cfg(feature = "vdr_proxy_ledger")]
 mod mapping_indyvdr_proxy;
 mod mapping_others;
-#[cfg(any(feature = "vdrtools", feature = "modular_libs", feature = "vdr_proxy_ledger"))]
-mod mapping_vdrtools;
diff --git a/aries_vcx_core/src/ledger/mod.rs b/aries_vcx_core/src/ledger/mod.rs
index a343006d1c..58b1e72b12 100644
--- a/aries_vcx_core/src/ledger/mod.rs
+++ b/aries_vcx_core/src/ledger/mod.rs
@@ -12,9 +12,9 @@ pub mod request_submitter;
 #[cfg(any(feature = "modular_libs", feature = "vdr_proxy_ledger"))]
 pub mod response_cacher;
 
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_ledger")]
 pub mod indy;
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_ledger")]
 pub mod indy_ledger;
 
 fn map_error_not_found_to_none<T, E>(res: Result<T, E>) -> Result<Option<T>, AriesVcxCoreError>
diff --git a/aries_vcx_core/src/lib.rs b/aries_vcx_core/src/lib.rs
index 49db215942..b58eb23e73 100644
--- a/aries_vcx_core/src/lib.rs
+++ b/aries_vcx_core/src/lib.rs
@@ -29,16 +29,21 @@ extern crate derive_builder;
 pub mod anoncreds;
 pub mod errors;
 pub mod global;
-#[cfg(feature = "vdrtools")]
+#[cfg(any(
+    feature = "vdrtools_anoncreds",
+    feature = "vdrtools_ledger",
+    feature = "vdrtools_wallet"
+))]
 pub mod indy;
 pub mod ledger;
 pub mod utils;
 pub mod wallet;
 
-#[cfg(feature = "vdrtools")]
-pub use vdrtools::{
-    PoolHandle, SearchHandle, WalletHandle, INVALID_POOL_HANDLE, INVALID_SEARCH_HANDLE, INVALID_WALLET_HANDLE,
-};
+#[cfg(feature = "vdrtools_ledger")]
+pub use vdrtools::{PoolHandle, INVALID_POOL_HANDLE};
+
+#[cfg(feature = "vdrtools_wallet")]
+pub use vdrtools::{SearchHandle, WalletHandle, INVALID_SEARCH_HANDLE, INVALID_WALLET_HANDLE};
 
 #[cfg(feature = "vdr_proxy_ledger")]
 pub use indy_vdr_proxy_client::VdrProxyClient;
diff --git a/aries_vcx_core/src/wallet/indy/agency_client_wallet.rs b/aries_vcx_core/src/wallet/agency_client_wallet.rs
similarity index 98%
rename from aries_vcx_core/src/wallet/indy/agency_client_wallet.rs
rename to aries_vcx_core/src/wallet/agency_client_wallet.rs
index 9108d27d8c..c31d8909f1 100644
--- a/aries_vcx_core/src/wallet/indy/agency_client_wallet.rs
+++ b/aries_vcx_core/src/wallet/agency_client_wallet.rs
@@ -5,7 +5,7 @@ use async_trait::async_trait;
 
 use agency_client::errors::error::{AgencyClientError, AgencyClientErrorKind, AgencyClientResult};
 use agency_client::wallet::base_agency_client_wallet::BaseAgencyClientWallet;
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_wallet")]
 use vdrtools::WalletHandle;
 
 use crate::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult};
@@ -110,7 +110,7 @@ impl BaseWallet for AgencyClientWallet {
         Ok(self.inner.unpack_message(msg).await?)
     }
 
-    #[cfg(feature = "vdrtools")]
+    #[cfg(feature = "vdrtools_wallet")]
     fn get_wallet_handle(&self) -> WalletHandle {
         unimplemented!("AgencyClientWallet::get_wallet_handle - this was not expected to be called")
     }
diff --git a/aries_vcx_core/src/wallet/base_wallet.rs b/aries_vcx_core/src/wallet/base_wallet.rs
index a08e3a71cc..cabf0805fb 100644
--- a/aries_vcx_core/src/wallet/base_wallet.rs
+++ b/aries_vcx_core/src/wallet/base_wallet.rs
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use async_trait::async_trait;
 
-#[cfg(feature = "vdrtools")]
-use vdrtools::WalletHandle;
+#[cfg(feature = "vdrtools_wallet")]
+use crate::WalletHandle;
 
 use crate::errors::error::VcxCoreResult;
 use crate::utils::async_fn_iterator::AsyncFnIterator;
@@ -13,7 +13,7 @@ use crate::utils::async_fn_iterator::AsyncFnIterator;
 /// see: <https://github.com/hyperledger/indy-sdk/blob/main/libindy/src/api/wallet.rs>
 #[async_trait]
 pub trait BaseWallet: std::fmt::Debug + Send + Sync {
-    #[cfg(feature = "vdrtools")]
+    #[cfg(feature = "vdrtools_wallet")]
     fn get_wallet_handle(&self) -> WalletHandle;
 
     // ----- DIDs
diff --git a/aries_vcx_core/src/wallet/indy/indy_wallet.rs b/aries_vcx_core/src/wallet/indy/indy_wallet.rs
index e7ab5ab9bf..9ba994ee6b 100644
--- a/aries_vcx_core/src/wallet/indy/indy_wallet.rs
+++ b/aries_vcx_core/src/wallet/indy/indy_wallet.rs
@@ -115,6 +115,7 @@ impl BaseWallet for IndySdkWallet {
         wallet::indy::signing::unpack_message(self.wallet_handle, msg).await
     }
 
+    #[cfg(feature = "vdrtools_wallet")]
     fn get_wallet_handle(&self) -> WalletHandle {
         self.wallet_handle
     }
diff --git a/aries_vcx_core/src/wallet/indy/internal/mod.rs b/aries_vcx_core/src/wallet/indy/internal/mod.rs
index f644ab91ca..ee723fab3f 100644
--- a/aries_vcx_core/src/wallet/indy/internal/mod.rs
+++ b/aries_vcx_core/src/wallet/indy/internal/mod.rs
@@ -1,7 +1,6 @@
 use crate::errors::error::VcxCoreResult;
 use crate::global::settings;
-use crate::{SearchHandle, WalletHandle};
-use vdrtools::Locator;
+use vdrtools::{Locator, SearchHandle, WalletHandle};
 
 pub(crate) async fn add_wallet_record(
     wallet_handle: WalletHandle,
diff --git a/aries_vcx_core/src/wallet/indy/mod.rs b/aries_vcx_core/src/wallet/indy/mod.rs
index f21bc0b877..08714db6db 100644
--- a/aries_vcx_core/src/wallet/indy/mod.rs
+++ b/aries_vcx_core/src/wallet/indy/mod.rs
@@ -15,7 +15,6 @@ use crate::{SearchHandle, WalletHandle};
 
 use super::base_wallet::BaseWallet;
 
-pub mod agency_client_wallet;
 pub mod did_mocks;
 pub mod indy_wallet;
 pub mod internal;
diff --git a/aries_vcx_core/src/wallet/indy/wallet.rs b/aries_vcx_core/src/wallet/indy/wallet.rs
index a42b7e2e6b..79500bc363 100644
--- a/aries_vcx_core/src/wallet/indy/wallet.rs
+++ b/aries_vcx_core/src/wallet/indy/wallet.rs
@@ -3,17 +3,14 @@ use serde::{Deserialize, Serialize};
 use vdrtools::{
     types::domain::wallet::{default_key_derivation_method, KeyDerivationMethod},
     types::errors::IndyErrorKind,
-    DidMethod, DidValue, KeyInfo, Locator, MyDidInfo,
+    DidMethod, DidValue, KeyInfo, Locator, MyDidInfo, WalletHandle,
 };
 
+use crate::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult};
+use crate::global::settings;
 use crate::wallet::indy::did_mocks::{did_mocks_enabled, DidMocks};
 use crate::wallet::indy::{IssuerConfig, RestoreWalletConfigs, WalletConfig};
 use crate::SearchHandle;
-use crate::{
-    anoncreds::indy::credentials::holder,
-    errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
-};
-use crate::{global::settings, WalletHandle};
 use crate::{secret, utils};
 
 pub async fn open_wallet(wallet_config: &WalletConfig) -> VcxCoreResult<WalletHandle> {
diff --git a/aries_vcx/src/utils/mockdata/profile/mock_wallet.rs b/aries_vcx_core/src/wallet/mock_wallet.rs
similarity index 91%
rename from aries_vcx/src/utils/mockdata/profile/mock_wallet.rs
rename to aries_vcx_core/src/wallet/mock_wallet.rs
index 61b5438289..6514e82c6a 100644
--- a/aries_vcx/src/utils/mockdata/profile/mock_wallet.rs
+++ b/aries_vcx_core/src/wallet/mock_wallet.rs
@@ -1,12 +1,13 @@
-use aries_vcx_core::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult};
-use aries_vcx_core::utils::async_fn_iterator::AsyncFnIterator;
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use std::collections::HashMap;
+
 use async_trait::async_trait;
 
+use crate::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult};
+use crate::utils::async_fn_iterator::AsyncFnIterator;
 use crate::utils::{self};
-#[cfg(feature = "vdrtools")]
-use aries_vcx_core::WalletHandle;
-use std::collections::HashMap;
+use crate::wallet::base_wallet::BaseWallet;
+#[cfg(feature = "vdrtools_wallet")]
+use crate::WalletHandle;
 
 #[derive(Debug)]
 pub struct MockWallet;
@@ -16,7 +17,7 @@ pub struct MockWallet;
 #[allow(unused)]
 #[async_trait]
 impl BaseWallet for MockWallet {
-    #[cfg(feature = "vdrtools")]
+    #[cfg(feature = "vdrtools_wallet")]
     fn get_wallet_handle(&self) -> WalletHandle {
         WalletHandle(1)
     }
diff --git a/aries_vcx_core/src/wallet/mod.rs b/aries_vcx_core/src/wallet/mod.rs
index 904df0bfbd..048e8bff4a 100644
--- a/aries_vcx_core/src/wallet/mod.rs
+++ b/aries_vcx_core/src/wallet/mod.rs
@@ -1,3 +1,5 @@
+pub mod agency_client_wallet;
 pub mod base_wallet;
-#[cfg(feature = "vdrtools")]
+#[cfg(feature = "vdrtools_wallet")]
 pub mod indy;
+pub mod mock_wallet;
diff --git a/did_resolver_sov/Cargo.toml b/did_resolver_sov/Cargo.toml
index 7536698f65..318790ddd2 100644
--- a/did_resolver_sov/Cargo.toml
+++ b/did_resolver_sov/Cargo.toml
@@ -3,14 +3,9 @@ name = "did_resolver_sov"
 version = "0.1.0"
 edition = "2021"
 
-[features]
-default = []
-vdrtools = ["aries_vcx_core/vdrtools"]
-modular_libs = ["aries_vcx_core/modular_libs"]
-
 [dependencies]
 did_resolver = { path = "../did_resolver" }
-aries_vcx_core = { path = "../aries_vcx_core" }
+aries_vcx_core = { path = "../aries_vcx_core", features = ["modular_libs"] }
 did_doc_sov = { path = "../did_doc_sov" }
 async-trait = "0.1.68"
 mockall = "0.11.4"
diff --git a/libvcx_core/src/api_vcx/api_global/agency_client.rs b/libvcx_core/src/api_vcx/api_global/agency_client.rs
index 81df85794e..3de3369042 100644
--- a/libvcx_core/src/api_vcx/api_global/agency_client.rs
+++ b/libvcx_core/src/api_vcx/api_global/agency_client.rs
@@ -7,7 +7,7 @@ use aries_vcx::agency_client::agency_client::AgencyClient;
 use aries_vcx::agency_client::configuration::{AgencyClientConfig, AgentProvisionConfig};
 use aries_vcx::agency_client::messages::update_message::UIDsByConn;
 use aries_vcx::agency_client::MessageStatusCode;
-use aries_vcx::aries_vcx_core::wallet::indy::agency_client_wallet::ToBaseAgencyClientWallet;
+use aries_vcx::aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 use super::profile::get_main_wallet;
 
diff --git a/libvcx_core/src/api_vcx/api_global/profile.rs b/libvcx_core/src/api_vcx/api_global/profile.rs
index 4670b97754..d5d0e548ef 100644
--- a/libvcx_core/src/api_vcx/api_global/profile.rs
+++ b/libvcx_core/src/api_vcx/api_global/profile.rs
@@ -11,12 +11,12 @@ use aries_vcx::aries_vcx_core::ledger::base_ledger::{
     AnoncredsLedgerRead, AnoncredsLedgerWrite, IndyLedgerRead, IndyLedgerWrite, TxnAuthrAgrmtOptions,
 };
 use aries_vcx::aries_vcx_core::wallet::indy::IndySdkWallet;
+use aries_vcx::aries_vcx_core::wallet::mock_wallet::MockWallet;
 use aries_vcx::aries_vcx_core::{wallet::base_wallet::BaseWallet, WalletHandle};
 use aries_vcx::core::profile::{profile::Profile, vdrtools_profile::VdrtoolsProfile};
 use aries_vcx::errors::error::VcxResult;
 use aries_vcx::utils::mockdata::profile::mock_anoncreds::MockAnoncreds;
 use aries_vcx::utils::mockdata::profile::mock_ledger::MockLedger;
-use aries_vcx::utils::mockdata::profile::mock_wallet::MockWallet;
 use aries_vcx::{global::settings::indy_mocks_enabled, utils::mockdata::profile::mock_profile::MockProfile};
 
 pub trait ProfileV2: Send + Sync {