diff --git a/.gitignore b/.gitignore
index 1f85ede..c46aa2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-cache/
-out/
\ No newline at end of file
+onchain/cache/
+onchain/out/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 888d42d..e9dccc6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
+
+[submodule "onchain/lib/forge-std"]
+	path = onchain/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
diff --git a/foundry.toml b/onchain/foundry.toml
similarity index 100%
rename from foundry.toml
rename to onchain/foundry.toml
diff --git a/lib/forge-std b/onchain/lib/forge-std
similarity index 100%
rename from lib/forge-std
rename to onchain/lib/forge-std
diff --git a/script/Counter.s.sol b/onchain/script/Counter.s.sol
similarity index 100%
rename from script/Counter.s.sol
rename to onchain/script/Counter.s.sol
diff --git a/src/Push3IntAdapter.sol b/onchain/src/Push3IntAdapter.sol
similarity index 100%
rename from src/Push3IntAdapter.sol
rename to onchain/src/Push3IntAdapter.sol
diff --git a/src/Push3Interpreter.sol b/onchain/src/Push3Interpreter.sol
similarity index 100%
rename from src/Push3Interpreter.sol
rename to onchain/src/Push3Interpreter.sol
diff --git a/test/Push3IntAdapter.t.sol b/onchain/test/Push3IntAdapter.t.sol
similarity index 100%
rename from test/Push3IntAdapter.t.sol
rename to onchain/test/Push3IntAdapter.t.sol
diff --git a/test/Push3Interpreter.t.sol b/onchain/test/Push3Interpreter.t.sol
similarity index 100%
rename from test/Push3Interpreter.t.sol
rename to onchain/test/Push3Interpreter.t.sol