diff --git a/foundry.toml b/foundry.toml
new file mode 100644
index 0000000..e6810b2
--- /dev/null
+++ b/foundry.toml
@@ -0,0 +1,6 @@
+[profile.default]
+src = 'src'
+out = 'out'
+libs = ['lib']
+
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config
\ No newline at end of file
diff --git a/lib/forge-std b/lib/forge-std
new file mode 160000
index 0000000..73a504d
--- /dev/null
+++ b/lib/forge-std
@@ -0,0 +1 @@
+Subproject commit 73a504d2cf6f37b7ce285b479f4c681f76e95f1b
diff --git a/lib/prb-math b/lib/prb-math
new file mode 160000
index 0000000..9febcdd
--- /dev/null
+++ b/lib/prb-math
@@ -0,0 +1 @@
+Subproject commit 9febcdd219f08f7fb70fdf0e156f1be4103c42dd
diff --git a/remappings.txt b/remappings.txt
new file mode 100644
index 0000000..3e86707
--- /dev/null
+++ b/remappings.txt
@@ -0,0 +1,5 @@
+@prb/math/=lib/prb-math/src/
+@root/=src/
+
+forge-std/=lib/forge-std/src/
+
diff --git a/contracts/DelegatedVesting.sol b/src/DelegatedVesting.sol
similarity index 100%
rename from contracts/DelegatedVesting.sol
rename to src/DelegatedVesting.sol
diff --git a/contracts/LiquidityManagement.sol b/src/LiquidityManagement.sol
similarity index 98%
rename from contracts/LiquidityManagement.sol
rename to src/LiquidityManagement.sol
index 9aaac38..db46f4b 100755
--- a/contracts/LiquidityManagement.sol
+++ b/src/LiquidityManagement.sol
@@ -10,10 +10,10 @@ contract LiquidityManagement {
 
   address constant DAI_ADDRESS = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
   address constant TORN_ADDRESS = 0x77777FeDdddFfC19Ff86DB637967013e6C6A116C;
-  address constant ETH_TORN_ADDRESS = 0x0C722a487876989Af8a05FFfB6e32e45cc23FB3A; // TORN/ETH ?
+  address constant ETH_TORN_ADDRESS = 0x0C722a487876989Af8a05FFfB6e32e45cc23FB3A; 
   address constant DAI_TORN_ADDRESS = 0xb9C6f39dB4e81DB44Cf057C7D4d8e3193745101E;
   address constant UNIV2_ROUTER02_ADDRESS = 0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D;
-  address constant TORN_TREASURY = 0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce; // Governance
+  address constant TORN_TREASURY = 0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce; 
 
   IERC20 DAI;
   IERC20 TORN;
diff --git a/contracts/RollingDutchAuction.sol b/src/RollingDutchAuction.sol
old mode 100644
new mode 100755
similarity index 100%
rename from contracts/RollingDutchAuction.sol
rename to src/RollingDutchAuction.sol
diff --git a/contracts/interfaces/IERC20.sol b/src/interfaces/IERC20.sol
similarity index 100%
rename from contracts/interfaces/IERC20.sol
rename to src/interfaces/IERC20.sol
diff --git a/contracts/interfaces/IGovernance.sol b/src/interfaces/IGovernance.sol
similarity index 100%
rename from contracts/interfaces/IGovernance.sol
rename to src/interfaces/IGovernance.sol
diff --git a/contracts/interfaces/IUniswapV2Router02.sol b/src/interfaces/IUniswapV2Router02.sol
similarity index 100%
rename from contracts/interfaces/IUniswapV2Router02.sol
rename to src/interfaces/IUniswapV2Router02.sol
diff --git a/test/index.ts b/test/index.ts
deleted file mode 100755
index 0db5319..0000000
--- a/test/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { ethers, config, web3, artifacts } from "hardhat"
-import { expect } from "chai"
-
-import { Signer, BigNumber } from "ethers"