diff --git a/scripts/constant/constant.ts b/scripts/constant/constant.ts
index 14fcbe2f..9e659d77 100644
--- a/scripts/constant/constant.ts
+++ b/scripts/constant/constant.ts
@@ -1,6 +1,6 @@
 export const constants = {
   address_zero: "0x0000000000000000000000000000000000000000",
-  eth_addr: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+  native_address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
   max_value:
     "115792089237316195423570985008687907853269984665640564039457584007913129639935",
 };
diff --git a/scripts/deploy.ts b/scripts/deployment/deploy.ts
similarity index 100%
rename from scripts/deploy.ts
rename to scripts/deployment/deploy.ts
diff --git a/scripts/deployAvaxConnector.ts b/scripts/deployment/deployAvaxConnector.ts
similarity index 100%
rename from scripts/deployAvaxConnector.ts
rename to scripts/deployment/deployAvaxConnector.ts
diff --git a/scripts/deployCompoundMapping.ts b/scripts/deployment/deployCompoundMapping.ts
similarity index 100%
rename from scripts/deployCompoundMapping.ts
rename to scripts/deployment/deployCompoundMapping.ts
diff --git a/scripts/deployConnector.ts b/scripts/deployment/deployConnector.ts
similarity index 100%
rename from scripts/deployConnector.ts
rename to scripts/deployment/deployConnector.ts
diff --git a/scripts/deployConnectorsFromCmd.ts b/scripts/deployment/deployConnectorsFromCmd.ts
similarity index 100%
rename from scripts/deployConnectorsFromCmd.ts
rename to scripts/deployment/deployConnectorsFromCmd.ts
diff --git a/scripts/deployInstaMappingController.ts b/scripts/deployment/deployInstaMappingController.ts
similarity index 100%
rename from scripts/deployInstaMappingController.ts
rename to scripts/deployment/deployInstaMappingController.ts
diff --git a/scripts/deployMappingContract.ts b/scripts/deployment/deployMappingContract.ts
similarity index 100%
rename from scripts/deployMappingContract.ts
rename to scripts/deployment/deployMappingContract.ts
diff --git a/scripts/deploySingle.ts b/scripts/deployment/deploySingle.ts
similarity index 91%
rename from scripts/deploySingle.ts
rename to scripts/deployment/deploySingle.ts
index a8bb344a..51a0eb47 100644
--- a/scripts/deploySingle.ts
+++ b/scripts/deployment/deploySingle.ts
@@ -1,7 +1,6 @@
 import * as hre from "hardhat";
 const { ethers } = hre;
-
-const deployConnector = require("./deployConnector");
+import { deployConnector } from "./deployConnector";
 
 async function main() {
   const address = await deployConnector("ConnectOne"); // Example
diff --git a/scripts/addLiquidity.ts b/scripts/tests/addLiquidity.ts
similarity index 100%
rename from scripts/addLiquidity.ts
rename to scripts/tests/addLiquidity.ts
diff --git a/scripts/polygon/buildDSAv2.ts b/scripts/tests/buildDSAv2.ts
similarity index 84%
rename from scripts/polygon/buildDSAv2.ts
rename to scripts/tests/buildDSAv2.ts
index de623b32..0820b14e 100644
--- a/scripts/polygon/buildDSAv2.ts
+++ b/scripts/tests/buildDSAv2.ts
@@ -1,11 +1,10 @@
 import { ethers } from "hardhat";
 
-import { addresses } from "./constant/addresses";
+import { addresses } from "../constant/addresses";
 import { abis } from "../constant/abis";
-
 import { abi } from "../../deployements/mainnet/Implementation_m1.sol/InstaImplementationM1.json";
 
-module.exports = async function(owner: any) {
+export async function buildDSAv2(owner: any) {
   const instaIndex = await ethers.getContractAt(
     abis.core.instaIndex,
     addresses.core.instaIndex
@@ -17,4 +16,4 @@ module.exports = async function(owner: any) {
     (a: { event: string }) => a.event === "LogAccountCreated"
   );
   return await ethers.getContractAt(abi, event.args.account);
-};
+}
diff --git a/scripts/deployAndEnableConnector.ts b/scripts/tests/deployAndEnableConnector.ts
similarity index 56%
rename from scripts/deployAndEnableConnector.ts
rename to scripts/tests/deployAndEnableConnector.ts
index 456f5076..362277f2 100644
--- a/scripts/deployAndEnableConnector.ts
+++ b/scripts/tests/deployAndEnableConnector.ts
@@ -1,10 +1,10 @@
-import { addresses } from "./constant/addresses";
-import { abis } from "./constant/abis";
+import { addresses } from "../constant/addresses";
+import { abis } from "../constant/abis";
 
 // const { deployContract } = waffle;
-import { ethers } from "hardhat";
-import { promises as fs } from "fs";
-import { deployContract } from "ethereum-waffle";
+// import { ethers } from "hardhat";
+// import { promises as fs } from "fs";
+// import { deployContract } from "ethereum-waffle";
 
 export async function deployAndEnableConnector({
   connectorName,
@@ -12,7 +12,8 @@ export async function deployAndEnableConnector({
   signer,
   connectors,
 }) {
-  const connectorInstanace = await deployContract(signer, contractArtifact, []);
+  const deployer = new contractArtifact(signer);
+  const connectorInstanace = await deployer.deploy();
 
   await connectors
     .connect(signer)
diff --git a/scripts/encodeFlashcastData.ts b/scripts/tests/encodeFlashcastData.ts
similarity index 80%
rename from scripts/encodeFlashcastData.ts
rename to scripts/tests/encodeFlashcastData.ts
index 3bfdd432..d7051737 100644
--- a/scripts/encodeFlashcastData.ts
+++ b/scripts/tests/encodeFlashcastData.ts
@@ -1,5 +1,3 @@
-import { addresses } from "./constant/addresses";
-import { abis } from "./constant/abis";
 import * as hre from "hardhat";
 const { web3 } = hre;
 
diff --git a/scripts/polygon/encodeSpells.ts b/scripts/tests/encodeSpells.ts
similarity index 84%
rename from scripts/polygon/encodeSpells.ts
rename to scripts/tests/encodeSpells.ts
index c7e43755..62a7a8bb 100644
--- a/scripts/polygon/encodeSpells.ts
+++ b/scripts/tests/encodeSpells.ts
@@ -1,8 +1,7 @@
-import { addresses } from "./constant/addresses";
-import { abis } from "../constant/abis";
 import { web3 } from "hardhat";
+import { abis } from "../constant/abis";
 
-module.exports = function(spells: any[]) {
+export function encodeSpells(spells: any[]) {
   const targets = spells.map((a) => a.connector);
   const calldatas = spells.map((a) => {
     const functionName = a.method;
@@ -15,4 +14,4 @@ module.exports = function(spells: any[]) {
     return web3.eth.abi.encodeFunctionCall(abi, a.args);
   });
   return [targets, calldatas];
-};
+}
diff --git a/scripts/getMasterSigner.ts b/scripts/tests/getMasterSigner.ts
similarity index 86%
rename from scripts/getMasterSigner.ts
rename to scripts/tests/getMasterSigner.ts
index 0c0778d5..59f59afb 100644
--- a/scripts/getMasterSigner.ts
+++ b/scripts/tests/getMasterSigner.ts
@@ -1,6 +1,6 @@
 import { ethers, network } from "hardhat";
-import { addresses } from "./constant/addresses";
-import { abis } from "./constant/abis";
+import { addresses } from "../constant/addresses";
+import { abis } from "../constant/abis";
 
 export async function getMasterSigner() {
   const [_, __, ___, wallet3] = await ethers.getSigners();
diff --git a/scripts/impersonate.ts b/scripts/tests/impersonate.ts
similarity index 100%
rename from scripts/impersonate.ts
rename to scripts/tests/impersonate.ts
diff --git a/scripts/buildDSAv2.ts b/scripts/tests/polygon/buildDSAv2.ts
similarity index 69%
rename from scripts/buildDSAv2.ts
rename to scripts/tests/polygon/buildDSAv2.ts
index 5b582e18..3c7b81f7 100644
--- a/scripts/buildDSAv2.ts
+++ b/scripts/tests/polygon/buildDSAv2.ts
@@ -1,10 +1,10 @@
 import { ethers } from "hardhat";
 
 import { addresses } from "./constant/addresses";
-import { abis } from "./constant/abis";
-import { abi } from "../deployements/mainnet/Implementation_m1.sol/InstaImplementationM1.json";
+import { abis } from "../../constant/abis";
+import { abi } from "../../../deployements/mainnet/Implementation_m1.sol/InstaImplementationM1.json";
 
-export async function buildDSAv2(owner: any) {
+module.exports = async function(owner: any) {
   const instaIndex = await ethers.getContractAt(
     abis.core.instaIndex,
     addresses.core.instaIndex
@@ -16,4 +16,4 @@ export async function buildDSAv2(owner: any) {
     (a: { event: string }) => a.event === "LogAccountCreated"
   );
   return await ethers.getContractAt(abi, event.args.account);
-}
+};
diff --git a/scripts/polygon/constant/addresses.ts b/scripts/tests/polygon/constant/addresses.ts
similarity index 100%
rename from scripts/polygon/constant/addresses.ts
rename to scripts/tests/polygon/constant/addresses.ts
diff --git a/scripts/polygon/constant/constant.ts b/scripts/tests/polygon/constant/constant.ts
similarity index 100%
rename from scripts/polygon/constant/constant.ts
rename to scripts/tests/polygon/constant/constant.ts
diff --git a/scripts/polygon/constant/tokens.ts b/scripts/tests/polygon/constant/tokens.ts
similarity index 100%
rename from scripts/polygon/constant/tokens.ts
rename to scripts/tests/polygon/constant/tokens.ts
diff --git a/scripts/polygon/deployAndEnableConnector.ts b/scripts/tests/polygon/deployAndEnableConnector.ts
similarity index 93%
rename from scripts/polygon/deployAndEnableConnector.ts
rename to scripts/tests/polygon/deployAndEnableConnector.ts
index a62806dd..355da3ac 100644
--- a/scripts/polygon/deployAndEnableConnector.ts
+++ b/scripts/tests/polygon/deployAndEnableConnector.ts
@@ -1,7 +1,7 @@
 import "@nomiclabs/hardhat-waffle";
 
 import { addresses } from "./constant/addresses";
-import { abis } from "../constant/abis";
+import { abis } from "../../constant/abis";
 
 import * as hre from "hardhat";
 const { ethers, waffle } = hre;
diff --git a/scripts/encodeSpells.ts b/scripts/tests/polygon/encodeSpells.ts
similarity index 75%
rename from scripts/encodeSpells.ts
rename to scripts/tests/polygon/encodeSpells.ts
index 9f4ac21b..d35b4277 100644
--- a/scripts/encodeSpells.ts
+++ b/scripts/tests/polygon/encodeSpells.ts
@@ -1,13 +1,12 @@
+import { abis } from "../../constant/abis";
 import { web3 } from "hardhat";
-import { addresses } from "./constant/addresses";
-import { abis } from "./constant/abis";
 
 export function encodeSpells(spells: any[]) {
   const targets = spells.map((a) => a.connector);
   const calldatas = spells.map((a) => {
     const functionName = a.method;
     // console.log(functionName)
-    const abi = abis.connectors[a.connector].find((b) => {
+    const abi = abis.connectors[a.connector].find((b: { name: any }) => {
       return b.name === functionName;
     });
     // console.log(functionName)
diff --git a/scripts/polygon/getMasterSigner.ts b/scripts/tests/polygon/getMasterSigner.ts
similarity index 93%
rename from scripts/polygon/getMasterSigner.ts
rename to scripts/tests/polygon/getMasterSigner.ts
index 558f3a27..43cf5e12 100644
--- a/scripts/polygon/getMasterSigner.ts
+++ b/scripts/tests/polygon/getMasterSigner.ts
@@ -1,6 +1,6 @@
 const { ethers, network } = "hardhat";
 import { addresses } from "./constant/addresses";
-import { abis } from "../constant/abis";
+import { abis } from "../../constant/abis";
 
 module.exports = async function() {
   const [_, __, ___, wallet3] = await ethers.getSigners();
diff --git a/status-checks/readme.md b/status-checks/readme.md
index ed376c25..aa1ff952 100644
--- a/status-checks/readme.md
+++ b/status-checks/readme.md
@@ -1,4 +1,3 @@
-
 # Check run
 
 use
diff --git a/test/mainnet/aave/v1.test.ts b/test/mainnet/aave/v1.test.ts
index f1a9d7e6..52e1607c 100644
--- a/test/mainnet/aave/v1.test.ts
+++ b/test/mainnet/aave/v1.test.ts
@@ -2,16 +2,16 @@ import { expect } from "chai";
 import "hardhat";
 import { abis } from "../../../scripts/constant/abis";
 import { addresses } from "../../../scripts/constant/addresses";
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector";
-import { getMasterSigner } from "../../../scripts/getMasterSigner";
-import { buildDSAv2 } from "../../../scripts/buildDSAv2";
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector";
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
 
 import ConnectV2AaveV1 from "../../artifacts/contracts/mainnet/connectors/aave/v1/main.sol/ConnectV2AaveV1.json";
 import { parseEther } from "@ethersproject/units";
-import { encodeSpells } from "../../../scripts/encodeSpells";
+import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { tokens } from "../../../scripts/constant/tokens";
 import { constants } from "../../../scripts/constant/constant";
-import { addLiquidity } from "../../../scripts/addLiquidity";
+import { addLiquidity } from "../../../scripts/tests/addLiquidity";
 // const { ethers } = hre;
 
 const ALCHEMY_ID = process.env.ALCHEMY_ID;
diff --git a/test/mainnet/aave/v2.test.ts b/test/mainnet/aave/v2.test.ts
index b836b088..f8b28ad2 100644
--- a/test/mainnet/aave/v2.test.ts
+++ b/test/mainnet/aave/v2.test.ts
@@ -2,38 +2,37 @@ import { expect } from "chai";
 import hre from "hardhat";
 import { abis } from "../../../scripts/constant/abis";
 import { addresses } from "../../../scripts/constant/addresses";
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector";
-import { getMasterSigner } from "../../../scripts/getMasterSigner";
-import { buildDSAv2 } from "../../../scripts/buildDSAv2";
-import { ConnectV2AaveV2 } from "../../artifacts/contracts/mainnet/connectors/aave/v2/main.sol/ConnectV2AaveV2.json";
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector";
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
+import { ConnectV2AaveV2, ConnectV2AaveV2__factory } from "../../../typechain";
 import { parseEther } from "@ethersproject/units";
-import { encodeSpells } from "../../../scripts/encodeSpells";
+import { encodeSpells } from "../../../scripts/tests/encodeSpells";
 import { tokens } from "../../../scripts/constant/tokens";
 import { constants } from "../../../scripts/constant/constant";
-import { addLiquidity } from "../../../scripts/addLiquidity";
-// const { ethers } = hre;
+import { addLiquidity } from "../../../scripts/tests/addLiquidity";
+const { ethers } = hre;
 
 describe("Aave V2", function () {
   const connectorName = "AAVEV2-TEST-A";
+  let connector: ConnectV2AaveV2;
 
-  let wallet0: any, wallet1: any;
+  let wallet0: any, wallet1: { address: any; };
   let dsaWallet0: any;
-  let instaConnectorsV2: any;
-  let connector: any;
-  let masterSigner: any;
-
+  let instaConnectorsV2: { address: any; };
+  let masterSigner: { address: any; };
   before(async () => {
-    await hre.network.provider.request({
-      method: "hardhat_reset",
-      params: [
-        {
-          forking: {
-            jsonRpcUrl: hre.config.networks.hardhat.forking.url,
-            blockNumber: 12796965,
-          },
-        },
-      ],
-    });
+    // await hre.network.provider.request({
+    //   method: "hardhat_reset",
+    //   params: [
+    //     {
+    //       forking: {
+    //         jsonRpcUrl: hre.config.networks.hardhat.forking.url,
+    //         blockNumber: 12796965,
+    //       },
+    //     },
+    //   ],
+    // });
     [wallet0, wallet1] = await ethers.getSigners();
     masterSigner = await getMasterSigner();
     instaConnectorsV2 = await ethers.getContractAt(
@@ -42,7 +41,7 @@ describe("Aave V2", function () {
     );
     connector = await deployAndEnableConnector({
       connectorName,
-      contractArtifact: ConnectV2AaveV2,
+      contractArtifact: ConnectV2AaveV2__factory,
       signer: masterSigner,
       connectors: instaConnectorsV2,
     });
diff --git a/test/mainnet/b.protocol/b.compound.test.ts b/test/mainnet/b.protocol/b.compound.test.ts
index a8bfffe7..1f0f20fa 100644
--- a/test/mainnet/b.protocol/b.compound.test.ts
+++ b/test/mainnet/b.protocol/b.compound.test.ts
@@ -3,10 +3,10 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre; //check
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/test/mainnet/b.protocol/b.liquity.test.ts b/test/mainnet/b.protocol/b.liquity.test.ts
index a59299a0..dd4e74ba 100644
--- a/test/mainnet/b.protocol/b.liquity.test.ts
+++ b/test/mainnet/b.protocol/b.liquity.test.ts
@@ -3,10 +3,10 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre; //check
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
 import { constants } from "../../../scripts/constant/constant";
diff --git a/test/mainnet/b.protocol/b.maker.test.ts b/test/mainnet/b.protocol/b.maker.test.ts
index a04a0f20..35f42390 100644
--- a/test/mainnet/b.protocol/b.maker.test.ts
+++ b/test/mainnet/b.protocol/b.maker.test.ts
@@ -4,10 +4,10 @@ const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
 import { constants } from "../../../scripts/constant/constant";
diff --git a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
index 66130bac..ea7c3bd6 100644
--- a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
+++ b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts
@@ -4,10 +4,10 @@ const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 import { abi: implementationsABI } from "../../../scripts/constant/abi/core/InstaImplementations.json"
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses"
 import { abis } from "../../../scripts/constant/abis"
diff --git a/test/mainnet/basic-ERC721/ERC721-transfer.ts b/test/mainnet/basic-ERC721/ERC721-transfer.ts
index 63b96004..bdc1ab80 100644
--- a/test/mainnet/basic-ERC721/ERC721-transfer.ts
+++ b/test/mainnet/basic-ERC721/ERC721-transfer.ts
@@ -5,10 +5,10 @@ const { provider, deployContract } = waffle
 import { abi : implementationsABI } from "../../../scripts/constant/abi/core/InstaImplementations.json"
 
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 
 import { addresses } from "../../../scripts/constant/addresses"
diff --git a/test/mainnet/compound/compound.test.ts b/test/mainnet/compound/compound.test.ts
index bf43420c..f08c2415 100644
--- a/test/mainnet/compound/compound.test.ts
+++ b/test/mainnet/compound/compound.test.ts
@@ -3,10 +3,10 @@ import hre from "hardhat";
 import { web3, deployments, waffle, ethers } = hre;
 import { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/test/mainnet/instapool/instapool.test.ts b/test/mainnet/instapool/instapool.test.ts
index 11365223..4904c652 100644
--- a/test/mainnet/instapool/instapool.test.ts
+++ b/test/mainnet/instapool/instapool.test.ts
@@ -3,11 +3,11 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { encodeFlashcastData } from "../../../scripts/encodeFlashcastData.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { encodeFlashcastData } from "../../../scripts/tests/encodeFlashcastData.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/test/mainnet/liquity/liquity.helpers.ts b/test/mainnet/liquity/liquity.helpers.ts
index 457a1412..5e1dd77f 100644
--- a/test/mainnet/liquity/liquity.helpers.ts
+++ b/test/mainnet/liquity/liquity.helpers.ts
@@ -2,10 +2,10 @@ import hre from "hardhat";
 import hardhatConfig from "../../../hardhat.config";
 
 // Instadapp deployment and testing helpers
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 // Instadapp instadappAddresses/ABIs
 import { instadappAddresses } from "../../../scripts/important/addresses";
diff --git a/test/mainnet/liquity/liquity.test.ts b/test/mainnet/liquity/liquity.test.ts
index 70bf96db..fd5ccd69 100644
--- a/test/mainnet/liquity/liquity.test.ts
+++ b/test/mainnet/liquity/liquity.test.ts
@@ -2,8 +2,8 @@ import hre from "hardhat";
 import { expect } from "chai";
 
 // Instadapp deployment and testing helpers
-import { buildDSAv2 } from "../../../scripts/buildDSAv2";
-import { encodeSpells } from "../../../scripts/encodeSpells.js";
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js";
 
 // Liquity smart contracts
 import contracts from "./liquity.contracts";
diff --git a/test/mainnet/pooltogether-polygon/pooltogether.test.ts b/test/mainnet/pooltogether-polygon/pooltogether.test.ts
index 61eaa370..462d7d4b 100644
--- a/test/mainnet/pooltogether-polygon/pooltogether.test.ts
+++ b/test/mainnet/pooltogether-polygon/pooltogether.test.ts
@@ -5,10 +5,10 @@ const { provider, deployContract } = waffle
 
 const ALCHEMY_ID = process.env.ALCHEMY_ID;
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 
 import { addresses } from "../../../scripts/constant/addresses"
diff --git a/test/mainnet/pooltogether/pooltogether.test.ts b/test/mainnet/pooltogether/pooltogether.test.ts
index e980b2ba..2aadfa8e 100644
--- a/test/mainnet/pooltogether/pooltogether.test.ts
+++ b/test/mainnet/pooltogether/pooltogether.test.ts
@@ -3,10 +3,10 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses"
 import { abis } from "../../../scripts/constant/abis"
diff --git a/test/mainnet/uniswap/uniswap.test.ts b/test/mainnet/uniswap/uniswap.test.ts
index e9cb8acd..cb1dc61e 100644
--- a/test/mainnet/uniswap/uniswap.test.ts
+++ b/test/mainnet/uniswap/uniswap.test.ts
@@ -3,12 +3,12 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js";
-import { buildDSAv2 } from "../../../scripts/buildDSAv2";
-import { encodeSpells } from "../../../scripts/encodeSpells.js";
-import { encodeFlashcastData } from "../../../scripts/encodeFlashcastData.js";
-import { getMasterSigner } from "../../../scripts/getMasterSigner";
-import { addLiquidity } from "../../../scripts/addLiquidity";
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js";
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js";
+import { encodeFlashcastData } from "../../../scripts/tests/encodeFlashcastData.js";
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
+import { addLiquidity } from "../../../scripts/tests/addLiquidity";
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/test/mainnet/uniswapStake/uniswapStake.test.ts b/test/mainnet/uniswapStake/uniswapStake.test.ts
index 54f26b57..7051acec 100644
--- a/test/mainnet/uniswapStake/uniswapStake.test.ts
+++ b/test/mainnet/uniswapStake/uniswapStake.test.ts
@@ -3,11 +3,11 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js";
-import { buildDSAv2 } from "../../../scripts/buildDSAv2";
-import { encodeSpells } from "../../../scripts/encodeSpells.js";
-import { getMasterSigner } from "../../../scripts/getMasterSigner";
-import { addLiquidity } from "../../../scripts/addLiquidity";
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js";
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js";
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
+import { addLiquidity } from "../../../scripts/tests/addLiquidity";
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/test/mainnet/yearn/yearn.test.ts b/test/mainnet/yearn/yearn.test.ts
index ce762575..c3e9028c 100644
--- a/test/mainnet/yearn/yearn.test.ts
+++ b/test/mainnet/yearn/yearn.test.ts
@@ -3,10 +3,10 @@ import hre from "hardhat";
 const { web3, deployments, waffle, ethers } = hre;
 const { provider, deployContract } = waffle
 
-import { deployAndEnableConnector } from "../../../scripts/deployAndEnableConnector.js"
-import { buildDSAv2 } from "../../../scripts/buildDSAv2"
-import { encodeSpells } from "../../../scripts/encodeSpells.js"
-import { getMasterSigner } from "../../../scripts/getMasterSigner"
+import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
+import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
+import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
+import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
 
 import { addresses } from "../../../scripts/constant/addresses";
 import { abis } from "../../../scripts/constant/abis";
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..98421cca
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,27 @@
+// tsconfig.json
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "lib": ["es5", "es6"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noImplicitAny": true,
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "strict": true,
+    "target": "es5",
+  },
+  "exclude": ["artifacts", "node_modules"],
+  "files": ["./hardhat.config.ts"],
+  "include": [
+    "artifacts/**/*",
+    "artifacts/**/*.json",
+    "scripts/**/*",
+    "tasks/**/*",
+    "test/**/*",
+    "typechain/**/*",
+    "types/**/*"
+  ]
+}