diff --git a/src/backends/plonky2/common.rs b/src/backends/plonky2/circuits/common.rs
similarity index 97%
rename from src/backends/plonky2/common.rs
rename to src/backends/plonky2/circuits/common.rs
index 1522f05..80b2d6e 100644
--- a/src/backends/plonky2/common.rs
+++ b/src/backends/plonky2/circuits/common.rs
@@ -1,7 +1,7 @@
 //! Common functionality to build Pod circuits with plonky2
 
-use crate::backends::plonky2::mock_main::Statement;
-use crate::backends::plonky2::mock_main::{Operation, OperationArg};
+use crate::backends::plonky2::mock::mainpod::Statement;
+use crate::backends::plonky2::mock::mainpod::{Operation, OperationArg};
 use crate::middleware::{Params, StatementArg, ToFields, Value, F, HASH_SIZE, VALUE_SIZE};
 use crate::middleware::{OPERATION_ARG_F_LEN, STATEMENT_ARG_F_LEN};
 use anyhow::Result;
diff --git a/src/backends/plonky2/main.rs b/src/backends/plonky2/circuits/mainpod.rs
similarity index 97%
rename from src/backends/plonky2/main.rs
rename to src/backends/plonky2/circuits/mainpod.rs
index e419aad..a983974 100644
--- a/src/backends/plonky2/main.rs
+++ b/src/backends/plonky2/circuits/mainpod.rs
@@ -1,16 +1,3 @@
-use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
-use crate::backends::plonky2::common::{
-    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
-};
-use crate::backends::plonky2::mock_main::Operation;
-use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
-use crate::backends::plonky2::primitives::merkletree::{
-    MerkleProofExistenceGate, MerkleProofExistenceTarget,
-};
-use crate::middleware::{
-    hash_str, AnchoredKey, NativeOperation, NativePredicate, Params, PodType, Predicate, Statement,
-    StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
-};
 use anyhow::Result;
 use itertools::Itertools;
 use plonky2::{
@@ -28,6 +15,19 @@ use plonky2::{
 use std::collections::HashMap;
 use std::iter;
 
+use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
+use crate::backends::plonky2::circuits::common::{
+    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
+};
+use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
+use crate::backends::plonky2::primitives::merkletree::{
+    MerkleProofExistenceGate, MerkleProofExistenceTarget,
+};
+use crate::middleware::{
+    hash_str, AnchoredKey, NativeOperation, NativePredicate, Params, PodType, Predicate, Statement,
+    StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
+};
+
 //
 // SignedPod verification
 //
@@ -373,7 +373,7 @@ impl MainPodVerifyCircuit {
 mod tests {
     use super::*;
     use crate::backends::plonky2::basetypes::C;
-    use crate::backends::plonky2::mock_main;
+    use crate::backends::plonky2::mock::mainpod;
     use crate::middleware::OperationType;
     use plonky2::plonk::{circuit_builder::CircuitBuilder, circuit_data::CircuitConfig};
 
@@ -407,9 +407,9 @@ mod tests {
     }
 
     fn operation_verify(
-        st: mock_main::Statement,
-        op: mock_main::Operation,
-        prev_statements: Vec<mock_main::Statement>,
+        st: mainpod::Statement,
+        op: mainpod::Operation,
+        prev_statements: Vec<mainpod::Statement>,
     ) -> Result<()> {
         let params = Params::default();
 
@@ -452,8 +452,8 @@ mod tests {
     #[test]
     fn test_operation_verify() -> Result<()> {
         // None
-        let st: mock_main::Statement = Statement::None.into();
-        let op = mock_main::Operation(OperationType::Native(NativeOperation::None), vec![]);
+        let st: mainpod::Statement = Statement::None.into();
+        let op = mainpod::Operation(OperationType::Native(NativeOperation::None), vec![]);
         let prev_statements = vec![Statement::None.into()];
         operation_verify(st, op, prev_statements)?;
 
diff --git a/src/backends/plonky2/circuits/mod.rs b/src/backends/plonky2/circuits/mod.rs
new file mode 100644
index 0000000..134ab24
--- /dev/null
+++ b/src/backends/plonky2/circuits/mod.rs
@@ -0,0 +1,2 @@
+pub mod common;
+pub mod mainpod;
diff --git a/src/backends/plonky2/mock_main/mod.rs b/src/backends/plonky2/mock/mainpod/mod.rs
similarity index 99%
rename from src/backends/plonky2/mock_main/mod.rs
rename to src/backends/plonky2/mock/mainpod/mod.rs
index 4583ab5..c3c5fb9 100644
--- a/src/backends/plonky2/mock_main/mod.rs
+++ b/src/backends/plonky2/mock/mainpod/mod.rs
@@ -505,7 +505,7 @@ impl Pod for MockMainPod {
 #[cfg(test)]
 pub mod tests {
     use super::*;
-    use crate::backends::plonky2::mock_signed::MockSigner;
+    use crate::backends::plonky2::mock::signedpod::MockSigner;
     use crate::examples::{
         great_boy_pod_full_flow, tickets_pod_full_flow, zu_kyc_pod_builder,
         zu_kyc_sign_pod_builders,
diff --git a/src/backends/plonky2/mock_main/operation.rs b/src/backends/plonky2/mock/mainpod/operation.rs
similarity index 100%
rename from src/backends/plonky2/mock_main/operation.rs
rename to src/backends/plonky2/mock/mainpod/operation.rs
diff --git a/src/backends/plonky2/mock_main/statement.rs b/src/backends/plonky2/mock/mainpod/statement.rs
similarity index 100%
rename from src/backends/plonky2/mock_main/statement.rs
rename to src/backends/plonky2/mock/mainpod/statement.rs
diff --git a/src/backends/plonky2/mock/mod.rs b/src/backends/plonky2/mock/mod.rs
new file mode 100644
index 0000000..f6aa1b7
--- /dev/null
+++ b/src/backends/plonky2/mock/mod.rs
@@ -0,0 +1,2 @@
+pub mod mainpod;
+pub mod signedpod;
diff --git a/src/backends/plonky2/mock_signed.rs b/src/backends/plonky2/mock/signedpod.rs
similarity index 98%
rename from src/backends/plonky2/mock_signed.rs
rename to src/backends/plonky2/mock/signedpod.rs
index e9c3b7a..d69523e 100644
--- a/src/backends/plonky2/mock_signed.rs
+++ b/src/backends/plonky2/mock/signedpod.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use std::any::Any;
 use std::collections::HashMap;
 
-use super::primitives::merkletree::MerkleTree;
+use crate::backends::plonky2::primitives::merkletree::MerkleTree;
 use crate::constants::MAX_DEPTH;
 use crate::middleware::{
     containers::Dictionary, hash_str, AnchoredKey, Hash, Params, Pod, PodId, PodSigner, PodType,
diff --git a/src/backends/plonky2/mod.rs b/src/backends/plonky2/mod.rs
index cff24be..3b92b5d 100644
--- a/src/backends/plonky2/mod.rs
+++ b/src/backends/plonky2/mod.rs
@@ -1,6 +1,4 @@
 pub mod basetypes;
-pub mod common;
-pub mod main;
-pub mod mock_main;
-pub mod mock_signed;
+pub mod circuits;
+pub mod mock;
 pub mod primitives;
diff --git a/src/backends/plonky2/primitives/merkletree_circuit.rs b/src/backends/plonky2/primitives/merkletree_circuit.rs
index c907a1a..fe4d236 100644
--- a/src/backends/plonky2/primitives/merkletree_circuit.rs
+++ b/src/backends/plonky2/primitives/merkletree_circuit.rs
@@ -23,10 +23,8 @@ use plonky2::{
 };
 use std::iter;
 
-use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
-use crate::backends::plonky2::common::{
-    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
-};
+use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F};
+use crate::backends::plonky2::circuits::common::{CircuitBuilderPod, ValueTarget};
 use crate::backends::plonky2::primitives::merkletree::MerkleProof;
 
 /// `MerkleProofGate` allows to verify both proofs of existence and proofs
diff --git a/src/examples.rs b/src/examples/mod.rs
similarity index 99%
rename from src/examples.rs
rename to src/examples/mod.rs
index a973132..d668514 100644
--- a/src/examples.rs
+++ b/src/examples/mod.rs
@@ -4,7 +4,7 @@ use anyhow::{anyhow, Result};
 use custom::{eth_dos_batch, eth_friend_batch};
 use std::collections::HashMap;
 
-use crate::backends::plonky2::mock_signed::MockSigner;
+use crate::backends::plonky2::mock::signedpod::MockSigner;
 use crate::frontend::{
     containers::{Dictionary, Set},
     MainPodBuilder, SignedPod, SignedPodBuilder, Statement, Value,
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 22fd99c..49b6331 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -997,8 +997,8 @@ pub mod build_utils {
 #[cfg(test)]
 pub mod tests {
     use super::*;
-    use crate::backends::plonky2::mock_main::MockProver;
-    use crate::backends::plonky2::mock_signed::MockSigner;
+    use crate::backends::plonky2::mock::mainpod::MockProver;
+    use crate::backends::plonky2::mock::signedpod::MockSigner;
     use crate::examples::{
         eth_dos_pod_builder, eth_friend_signed_pod_builder, great_boy_pod_full_flow,
         tickets_pod_full_flow, zu_kyc_pod_builder, zu_kyc_sign_pod_builders,
diff --git a/src/frontend/serialization.rs b/src/frontend/serialization.rs
index f30341d..4865220 100644
--- a/src/frontend/serialization.rs
+++ b/src/frontend/serialization.rs
@@ -3,8 +3,8 @@ use std::collections::{BTreeMap, HashMap};
 use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize, Serializer};
 
-use crate::backends::plonky2::mock_main::MockMainPod;
-use crate::backends::plonky2::mock_signed::MockSignedPod;
+use crate::backends::plonky2::mock::mainpod::MockMainPod;
+use crate::backends::plonky2::mock::signedpod::MockSignedPod;
 use crate::frontend::containers::Dictionary;
 use crate::frontend::Statement;
 use crate::middleware::PodId;
@@ -152,7 +152,7 @@ pub fn transform_value_schema(schema: &mut Schema) {
 #[cfg(test)]
 mod tests {
     use crate::{
-        backends::plonky2::{mock_main::MockProver, mock_signed::MockSigner},
+        backends::plonky2::mock::{mainpod::MockProver, signedpod::MockSigner},
         examples::{zu_kyc_pod_builder, zu_kyc_sign_pod_builders},
         frontend::{
             containers::{Array, Dictionary, Set},