diff --git a/.gitignore b/.gitignore
index b595c65..a52defd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,6 @@ coverage
 coverage.json
 typechain
 
-# don't push the environment vars!
-.env
-
 # Built application files
 .DS*
 *.apk
@@ -101,4 +98,21 @@ lint/tmp/
 
 gas-report.txt
 
-lib
\ No newline at end of file
+# Compiler files
+cache/
+out/
+
+# Ignores development broadcast logs
+!/broadcast
+/broadcast/*/31337/
+/broadcast/**/dry-run/
+/broadcast/
+
+# Docs
+docs/
+
+# Dotenv file
+.env
+
+# zkSync
+zkout/
diff --git a/.gitmodules b/.gitmodules
index ee15de6..aeaefe6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
+[submodule "lib/foundry-devops"]
+	path = lib/foundry-devops
+	url = https://github.com/cyfrin/foundry-devops
 [submodule "lib/chainlink-brownie-contracts"]
 	path = lib/chainlink-brownie-contracts
 	url = https://github.com/smartcontractkit/chainlink-brownie-contracts
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/solmate"]
+	path = lib/solmate
+	url = https://github.com/transmissions11/solmate
\ No newline at end of file
diff --git a/contracts/Raffle.sol b/contracts/Raffle.sol
index 870fd7a..d075bea 100644
--- a/contracts/Raffle.sol
+++ b/contracts/Raffle.sol
@@ -28,7 +28,7 @@ import {VRFConsumerBaseV2Plus} from "@chainlink/contracts/src/v0.8/vrf/dev/VRFCo
 import {VRFV2PlusClient} from "@chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol";
 import "@chainlink/contracts/src/v0.8/vrf/dev/interfaces/IVRFCoordinatorV2Plus.sol";
 import "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol";
-import "hardhat/console.sol";
+//import "hardhat/console.sol";
 
 error Raffle__NotEnoughETHEntered();
 error Raffle__TransferFailed();
diff --git a/foundry.toml b/foundry.toml
index 348e0d3..822c4e0 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -1,8 +1,14 @@
-# Foundry Configuration
-
-
 [profile.default]
 src = "contracts"
 out = "out"
 libs = ["lib"]
-remappings = ['@chainlink.=.contracts=/lib/chainlink-brownie-contracts/contracts/']
+
+remappings = [
+    '@chainlink/contracts/=lib/chainlink-brownie-contracts/contracts/', 
+    '@solmate=lib/solmate/src/',
+    "@chainlink/=lib/chainlink/contracts/src/v0.8/",
+    "hardhat/=./contracts/"
+]
+
+
+[profile.test]
diff --git a/lib/forge-std b/lib/forge-std
new file mode 160000
index 0000000..1714bee
--- /dev/null
+++ b/lib/forge-std
@@ -0,0 +1 @@
+Subproject commit 1714bee72e286e73f76e320d110e0eaf5c4e649d
diff --git a/script/Counter.s.sol b/script/Counter.s.sol
deleted file mode 100644
index cdc1fe9..0000000
--- a/script/Counter.s.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
-
-import {Script, console} from "forge-std/Script.sol";
-import {Counter} from "../src/Counter.sol";
-
-contract CounterScript is Script {
-    Counter public counter;
-
-    function setUp() public {}
-
-    function run() public {
-        vm.startBroadcast();
-
-        counter = new Counter();
-
-        vm.stopBroadcast();
-    }
-}
diff --git a/src/Counter.sol b/src/Counter.sol
deleted file mode 100644
index aded799..0000000
--- a/src/Counter.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
-
-contract Counter {
-    uint256 public number;
-
-    function setNumber(uint256 newNumber) public {
-        number = newNumber;
-    }
-
-    function increment() public {
-        number++;
-    }
-}
diff --git a/test/Counter.t.sol b/test/Counter.t.sol
deleted file mode 100644
index 54b724f..0000000
--- a/test/Counter.t.sol
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
-
-import {Test, console} from "forge-std/Test.sol";
-import {Counter} from "../src/Counter.sol";
-
-contract CounterTest is Test {
-    Counter public counter;
-
-    function setUp() public {
-        counter = new Counter();
-        counter.setNumber(0);
-    }
-
-    function test_Increment() public {
-        counter.increment();
-        assertEq(counter.number(), 1);
-    }
-
-    function testFuzz_SetNumber(uint256 x) public {
-        counter.setNumber(x);
-        assertEq(counter.number(), x);
-    }
-}