diff --git a/.gitmodules b/.gitmodules
index 29700af..96bfd38 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
-[submodule "circuits/plonky2x/contracts/forge/lib/forge-std"]
-	path = circuits/plonky2x/contracts/forge/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
 [submodule "vendor/starkyx"]
 	path = vendor/starkyx
 	url = git@github.com:succinctlabs/starkyx.git
 [submodule "vendor/succinctx"]
 	path = vendor/succinctx
 	url = git@github.com:succinctlabs/succinctx.git
-[submodule "circuits/plonky2x/verifier/lib/openzeppelin-contracts-upgradeable"]
-	path = circuits/plonky2x/verifier/lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "circuits/plonky2x/verifier/lib/openzeppelin-contracts"]
-	path = circuits/plonky2x/verifier/lib/openzeppelin-contracts
+[submodule "nearx/contract/lib/openzeppelin-contracts"]
+	path = nearx/contract/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "circuits/plonky2x/verifier/lib/foundry-devops"]
-	path = circuits/plonky2x/verifier/lib/foundry-devops
+[submodule "nearx/contract/lib/openzeppelin-contracts-upgradeable"]
+	path = nearx/contract/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "nearx/contract/lib/foundry-devops"]
+	path = nearx/contract/lib/foundry-devops
 	url = https://github.com/chainaccelorg/foundry-devops
-[submodule "circuits/plonky2x/contract/lib/solidity-bytes-utils"]
-	path = circuits/plonky2x/contract/lib/solidity-bytes-utils
+[submodule "nearx/contract/lib/solidity-bytes-utils"]
+	path = nearx/contract/lib/solidity-bytes-utils
 	url = https://github.com/GNSPS/solidity-bytes-utils
+[submodule "nearx/contract/lib/forge-std"]
+	path = nearx/contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/bin/client/src/client/mod.rs b/bin/client/src/client/mod.rs
index 1de74d0..497a925 100644
--- a/bin/client/src/client/mod.rs
+++ b/bin/client/src/client/mod.rs
@@ -113,7 +113,7 @@ impl Handler<BatchGetProof> for LightClient {
 
 impl LightClient {
     pub fn new(config: &Config) -> Result<Self> {
-        let client = rpc::NearRpcClient::new(config.network.clone());
+        let client = rpc::NearRpcClient::new(config.network);
 
         // TODO: store selector in config
         let store = store::sled::init(config)?;
diff --git a/nearx/contract/lib/forge-std b/nearx/contract/lib/forge-std
new file mode 160000
index 0000000..ae570fe
--- /dev/null
+++ b/nearx/contract/lib/forge-std
@@ -0,0 +1 @@
+Subproject commit ae570fec082bfe1c1f45b0acca4a2b4f84d345ce
diff --git a/nearx/contract/lib/foundry-devops b/nearx/contract/lib/foundry-devops
new file mode 160000
index 0000000..efe8780
--- /dev/null
+++ b/nearx/contract/lib/foundry-devops
@@ -0,0 +1 @@
+Subproject commit efe8780bb039b6d25642951764aac63fafd8faf1
diff --git a/nearx/contract/lib/openzeppelin-contracts b/nearx/contract/lib/openzeppelin-contracts
new file mode 160000
index 0000000..3def8f9
--- /dev/null
+++ b/nearx/contract/lib/openzeppelin-contracts
@@ -0,0 +1 @@
+Subproject commit 3def8f9d15871160a146353b975ad7adf4c2bf67
diff --git a/nearx/contract/lib/openzeppelin-contracts-upgradeable b/nearx/contract/lib/openzeppelin-contracts-upgradeable
new file mode 160000
index 0000000..f0fa8a3
--- /dev/null
+++ b/nearx/contract/lib/openzeppelin-contracts-upgradeable
@@ -0,0 +1 @@
+Subproject commit f0fa8a3d12015e5fa08efeadd8014d0aa3791ea2
diff --git a/nearx/contract/lib/solidity-bytes-utils b/nearx/contract/lib/solidity-bytes-utils
new file mode 160000
index 0000000..e0115c4
--- /dev/null
+++ b/nearx/contract/lib/solidity-bytes-utils
@@ -0,0 +1 @@
+Subproject commit e0115c4d231910df47ce3b60625ce562fe4af985
diff --git a/nearx/src/hint.rs b/nearx/src/hint.rs
index bd6c209..6db6c79 100644
--- a/nearx/src/hint.rs
+++ b/nearx/src/hint.rs
@@ -21,7 +21,7 @@ impl<L: PlonkParameters<D>, const D: usize> AsyncHint<L, D> for FetchNextHeaderI
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
 
         let h = input_stream.read_value::<CryptoHashVariable>().0;
 
@@ -59,7 +59,7 @@ impl<L: PlonkParameters<D>, const D: usize> AsyncHint<L, D> for FetchHeaderInput
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
 
         let h = input_stream.read_value::<CryptoHashVariable>().0;
 
@@ -102,7 +102,7 @@ impl<L: PlonkParameters<D>, const D: usize, const B: usize> AsyncHint<L, D>
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
         let block_merkle_root = input_stream.read_value::<CryptoHashVariable>().0;
         let last_verified = input_stream.read_value::<CryptoHashVariable>().0;