diff --git a/package.json b/package.json
index 9df17d4..9a9914a 100644
--- a/package.json
+++ b/package.json
@@ -7,18 +7,18 @@
     "url": "https://github.com/bcnmy"
   },
   "dependencies": {
-    "@biconomy-devx/erc7579-msa": "^0.0.4",
+    "@rhinestone/modulekit": "^0.4.10",
     "@uniswap/v3-core": "https://github.com/Uniswap/v3-core#0.8",
     "@uniswap/v3-periphery": "https://github.com/Uniswap/v3-periphery#0.8",
     "accountabstraction": "https://github.com/eth-infinitism/account-abstraction#develop",
-    "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
-    "nexus": "https://github.com/bcnmy/nexus#dev",
-    "@rhinestone/modulekit": "^0.4.10"
+    "nexus": "https://github.com/bcnmy/nexus#dev"
   },
   "devDependencies": {
+    "erc7579": "https://github.com/erc7579/erc7579-implementation",
+    "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts#master",
+    "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
     "@bonadocs/docgen": "^1.0.1-alpha.1",
     "@ethersproject/abstract-provider": "^5.7.0",
-    "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts#master",
     "@prb/test": "^0.6.4",
     "@typechain/ethers-v6": "^0.5.1",
     "@types/chai": "^4.3.11",
@@ -28,6 +28,7 @@
     "chai": "^4.3.7",
     "codecov": "^3.8.3",
     "ethers": "^6.11.1",
+    "module-bases": "github:rhinestonewtf/module-bases",
     "modulekit": "github:rhinestonewtf/modulekit",
     "prettier": "^3.2.5",
     "prettier-plugin-solidity": "^1.3.1",
diff --git a/remappings.txt b/remappings.txt
index de97ec3..e74a7da 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,9 +1,11 @@
-@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/.ignored_contracts/
+@openzeppelin/=node_modules/@openzeppelin/.ignored_contracts
+@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/.ignored_contracts/
 @prb/test/=node_modules/@prb/test/
 @nexus/=node_modules/nexus/
 forge-std/=lib/forge-std/src/
 account-abstraction/=node_modules/account-abstraction/contracts/
+@ERC4337/account-abstraction=node_modules/account-abstraction/
 @modulekit/=node_modules/modulekit/src/
 sentinellist/=node_modules/sentinellist/src/
 solady/=node_modules/solady/src/
@@ -14,3 +16,8 @@ solady/=node_modules/solady/src/
 solady/src/=node_modules/solady/src/
 excessively-safe-call/=node_modules/excessively-safe-call/src/
 modulekit/=node_modules/@rhinestone/modulekit/src/
+module-bases/=node_modules/module-bases/src/
+erc7579/=node_modules/erc7579/src/
+kernel/=node_modules/@zerodev/kernel/src/
+@safe-global/=node_modules/@safe-global/
+solarray/=node_modules/solarray/src/