diff --git a/Makefile b/Makefile
index 0cd736f..885b5f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 .PHONY: build
 build: build-tfhe-rs-capi
-	cd fhevm && go build .
+	cd packages/fhevm && go build .
 
 .PHONY: test
 test: build-tfhe-rs-capi
-	cd fhevm && go test -v . \
+	cd packages/fhevm && go test -v . \
 	&& cd ../tfhe && go test -v .
 
 .PHONY: build-tfhe-rs-capi
diff --git a/crypto/crypto.go b/packages/crypto/crypto.go
similarity index 100%
rename from crypto/crypto.go
rename to packages/crypto/crypto.go
diff --git a/fhevm/contract.go b/packages/fhevm/contract.go
similarity index 100%
rename from fhevm/contract.go
rename to packages/fhevm/contract.go
diff --git a/fhevm/contracts_test.go b/packages/fhevm/contracts_test.go
similarity index 100%
rename from fhevm/contracts_test.go
rename to packages/fhevm/contracts_test.go
diff --git a/fhevm/errors.go b/packages/fhevm/errors.go
similarity index 100%
rename from fhevm/errors.go
rename to packages/fhevm/errors.go
diff --git a/fhevm/evm.go b/packages/fhevm/evm.go
similarity index 100%
rename from fhevm/evm.go
rename to packages/fhevm/evm.go
diff --git a/fhevm/fhelib.go b/packages/fhevm/fhelib.go
similarity index 100%
rename from fhevm/fhelib.go
rename to packages/fhevm/fhelib.go
diff --git a/fhevm/instructions.go b/packages/fhevm/instructions.go
similarity index 100%
rename from fhevm/instructions.go
rename to packages/fhevm/instructions.go
diff --git a/fhevm/instructions_test.go b/packages/fhevm/instructions_test.go
similarity index 100%
rename from fhevm/instructions_test.go
rename to packages/fhevm/instructions_test.go
diff --git a/fhevm/interface.go b/packages/fhevm/interface.go
similarity index 100%
rename from fhevm/interface.go
rename to packages/fhevm/interface.go
diff --git a/fhevm/interpreter.go b/packages/fhevm/interpreter.go
similarity index 100%
rename from fhevm/interpreter.go
rename to packages/fhevm/interpreter.go
diff --git a/fhevm/memory.go b/packages/fhevm/memory.go
similarity index 100%
rename from fhevm/memory.go
rename to packages/fhevm/memory.go
diff --git a/fhevm/operators_arithmetic.go b/packages/fhevm/operators_arithmetic.go
similarity index 100%
rename from fhevm/operators_arithmetic.go
rename to packages/fhevm/operators_arithmetic.go
diff --git a/fhevm/operators_arithmetic_gas.go b/packages/fhevm/operators_arithmetic_gas.go
similarity index 100%
rename from fhevm/operators_arithmetic_gas.go
rename to packages/fhevm/operators_arithmetic_gas.go
diff --git a/fhevm/operators_bit.go b/packages/fhevm/operators_bit.go
similarity index 100%
rename from fhevm/operators_bit.go
rename to packages/fhevm/operators_bit.go
diff --git a/fhevm/operators_bit_gas.go b/packages/fhevm/operators_bit_gas.go
similarity index 100%
rename from fhevm/operators_bit_gas.go
rename to packages/fhevm/operators_bit_gas.go
diff --git a/fhevm/operators_comparison.go b/packages/fhevm/operators_comparison.go
similarity index 100%
rename from fhevm/operators_comparison.go
rename to packages/fhevm/operators_comparison.go
diff --git a/fhevm/operators_comparison_gas.go b/packages/fhevm/operators_comparison_gas.go
similarity index 100%
rename from fhevm/operators_comparison_gas.go
rename to packages/fhevm/operators_comparison_gas.go
diff --git a/fhevm/operators_crypto.go b/packages/fhevm/operators_crypto.go
similarity index 100%
rename from fhevm/operators_crypto.go
rename to packages/fhevm/operators_crypto.go
diff --git a/fhevm/operators_crypto_gas.go b/packages/fhevm/operators_crypto_gas.go
similarity index 100%
rename from fhevm/operators_crypto_gas.go
rename to packages/fhevm/operators_crypto_gas.go
diff --git a/fhevm/operators_rand.go b/packages/fhevm/operators_rand.go
similarity index 100%
rename from fhevm/operators_rand.go
rename to packages/fhevm/operators_rand.go
diff --git a/fhevm/operators_rand_gas.go b/packages/fhevm/operators_rand_gas.go
similarity index 100%
rename from fhevm/operators_rand_gas.go
rename to packages/fhevm/operators_rand_gas.go
diff --git a/fhevm/otel.go b/packages/fhevm/otel.go
similarity index 100%
rename from fhevm/otel.go
rename to packages/fhevm/otel.go
diff --git a/fhevm/params.go b/packages/fhevm/params.go
similarity index 100%
rename from fhevm/params.go
rename to packages/fhevm/params.go
diff --git a/fhevm/precompiles.go b/packages/fhevm/precompiles.go
similarity index 100%
rename from fhevm/precompiles.go
rename to packages/fhevm/precompiles.go
diff --git a/fhevm/protected_storage.go b/packages/fhevm/protected_storage.go
similarity index 100%
rename from fhevm/protected_storage.go
rename to packages/fhevm/protected_storage.go
diff --git a/fhevm/stack.go b/packages/fhevm/stack.go
similarity index 100%
rename from fhevm/stack.go
rename to packages/fhevm/stack.go
diff --git a/go.mod b/packages/go.mod
similarity index 100%
rename from go.mod
rename to packages/go.mod
diff --git a/go.sum b/packages/go.sum
similarity index 100%
rename from go.sum
rename to packages/go.sum
diff --git a/kms/constants.go b/packages/kms/constants.go
similarity index 100%
rename from kms/constants.go
rename to packages/kms/constants.go
diff --git a/kms/kms.pb.go b/packages/kms/kms.pb.go
similarity index 100%
rename from kms/kms.pb.go
rename to packages/kms/kms.pb.go
diff --git a/kms/kms_grpc.pb.go b/packages/kms/kms_grpc.pb.go
similarity index 100%
rename from kms/kms_grpc.pb.go
rename to packages/kms/kms_grpc.pb.go
diff --git a/tfhe/tfhe_ciphertext.go b/packages/tfhe/tfhe_ciphertext.go
similarity index 100%
rename from tfhe/tfhe_ciphertext.go
rename to packages/tfhe/tfhe_ciphertext.go
diff --git a/tfhe/tfhe_key_management.go b/packages/tfhe/tfhe_key_management.go
similarity index 100%
rename from tfhe/tfhe_key_management.go
rename to packages/tfhe/tfhe_key_management.go
diff --git a/tfhe/tfhe_test.go b/packages/tfhe/tfhe_test.go
similarity index 100%
rename from tfhe/tfhe_test.go
rename to packages/tfhe/tfhe_test.go
diff --git a/tfhe/tfhe_wrappers.c b/packages/tfhe/tfhe_wrappers.c
similarity index 100%
rename from tfhe/tfhe_wrappers.c
rename to packages/tfhe/tfhe_wrappers.c
diff --git a/tfhe/tfhe_wrappers.go b/packages/tfhe/tfhe_wrappers.go
similarity index 83%
rename from tfhe/tfhe_wrappers.go
rename to packages/tfhe/tfhe_wrappers.go
index 4228f2e..f713d6b 100644
--- a/tfhe/tfhe_wrappers.go
+++ b/packages/tfhe/tfhe_wrappers.go
@@ -1,10 +1,10 @@
 package tfhe
 
 /*
-#cgo linux CFLAGS: -O3 -I../tfhe-rs/target/release -I../tfhe-rs/target/release/deps
-#cgo linux LDFLAGS: -L../tfhe-rs/target/release -l:liba -L../tfhe-rs/target/release/deps -l:libtfhe_c_api_dynamic_buffer.a -lm
-#cgo darwin CFLAGS: -O3 -I../tfhe-rs/target/release -I../tfhe-rs/target/release/deps
-#cgo darwin LDFLAGS: -framework Security -L../tfhe-rs/target/release -ltfhe -L../tfhe-rs/target/release/deps -ltfhe_c_api_dynamic_buffer -lm
+#cgo linux CFLAGS: -O3 -I../../tfhe-rs/target/release -I../../tfhe-rs/target/release/deps
+#cgo linux LDFLAGS: -L../../tfhe-rs/target/release -l:liba -L../../tfhe-rs/target/release/deps -l:libtfhe_c_api_dynamic_buffer.a -lm
+#cgo darwin CFLAGS: -O3 -I../../tfhe-rs/target/release -I../../tfhe-rs/target/release/deps
+#cgo darwin LDFLAGS: -framework Security -L../../tfhe-rs/target/release -ltfhe -L../../tfhe-rs/target/release/deps -ltfhe_c_api_dynamic_buffer -lm
 
 #include "tfhe_wrappers.h"
 
diff --git a/tfhe/tfhe_wrappers.h b/packages/tfhe/tfhe_wrappers.h
similarity index 100%
rename from tfhe/tfhe_wrappers.h
rename to packages/tfhe/tfhe_wrappers.h