diff --git a/src/lib.cairo b/src/lib.cairo
index 1012d60..359971f 100644
--- a/src/lib.cairo
+++ b/src/lib.cairo
@@ -1,51 +1,7 @@
 pub mod blobstreamx;
 mod interfaces;
-
-mod mocks {
-    mod function_verifier;
-    mod upgradeable;
-}
-
+mod mocks;
 #[cfg(test)]
-mod tests {
-    mod common;
-    mod test_blobstreamx;
-    mod test_ownable;
-    mod test_upgradeable;
-}
-
-mod tree {
-    mod consts;
-    mod utils;
-    mod binary {
-        mod hasher;
-        mod merkle_proof;
-        mod merkle_tree;
-        #[cfg(test)]
-        mod tests {
-            mod test_hasher;
-            mod test_merkle_proof;
-        }
-    }
-    mod namespace {
-        mod merkle_tree;
-        #[cfg(test)]
-        mod tests {
-            mod test_merkle_tree;
-        }
-    }
-    #[cfg(test)]
-    mod tests {
-        mod test_consts;
-        mod test_utils;
-    }
-}
-
-mod verifier {
-    mod types;
-    #[cfg(test)]
-    mod tests {
-        mod test_verifier;
-    }
-}
-
+mod tests;
+mod tree;
+mod verifier;
diff --git a/src/mocks.cairo b/src/mocks.cairo
new file mode 100644
index 0000000..1264cd9
--- /dev/null
+++ b/src/mocks.cairo
@@ -0,0 +1,2 @@
+mod function_verifier;
+mod upgradeable;
diff --git a/src/tests.cairo b/src/tests.cairo
new file mode 100644
index 0000000..a567934
--- /dev/null
+++ b/src/tests.cairo
@@ -0,0 +1,4 @@
+mod common;
+mod test_blobstreamx;
+mod test_ownable;
+mod test_upgradeable;
diff --git a/src/tree.cairo b/src/tree.cairo
new file mode 100644
index 0000000..2813e02
--- /dev/null
+++ b/src/tree.cairo
@@ -0,0 +1,6 @@
+mod binary;
+mod consts;
+mod namespace;
+#[cfg(test)]
+mod tests;
+mod utils;
diff --git a/src/tree/binary.cairo b/src/tree/binary.cairo
new file mode 100644
index 0000000..596bbe7
--- /dev/null
+++ b/src/tree/binary.cairo
@@ -0,0 +1,5 @@
+mod hasher;
+mod merkle_proof;
+mod merkle_tree;
+#[cfg(test)]
+mod tests;
diff --git a/src/tree/binary/tests.cairo b/src/tree/binary/tests.cairo
new file mode 100644
index 0000000..65d5ade
--- /dev/null
+++ b/src/tree/binary/tests.cairo
@@ -0,0 +1,2 @@
+mod test_hasher;
+mod test_merkle_proof;
diff --git a/src/tree/namespace.cairo b/src/tree/namespace.cairo
new file mode 100644
index 0000000..7a25c68
--- /dev/null
+++ b/src/tree/namespace.cairo
@@ -0,0 +1,3 @@
+mod merkle_tree;
+#[cfg(test)]
+mod tests;
diff --git a/src/tree/namespace/tests.cairo b/src/tree/namespace/tests.cairo
new file mode 100644
index 0000000..d1120da
--- /dev/null
+++ b/src/tree/namespace/tests.cairo
@@ -0,0 +1 @@
+mod test_merkle_tree;
diff --git a/src/tree/tests.cairo b/src/tree/tests.cairo
new file mode 100644
index 0000000..ac36f53
--- /dev/null
+++ b/src/tree/tests.cairo
@@ -0,0 +1,2 @@
+mod test_consts;
+mod test_utils;
diff --git a/src/verifier.cairo b/src/verifier.cairo
new file mode 100644
index 0000000..fbeb5f4
--- /dev/null
+++ b/src/verifier.cairo
@@ -0,0 +1,3 @@
+#[cfg(test)]
+mod tests;
+mod types;
diff --git a/src/verifier/tests.cairo b/src/verifier/tests.cairo
new file mode 100644
index 0000000..8db8367
--- /dev/null
+++ b/src/verifier/tests.cairo
@@ -0,0 +1 @@
+mod test_verifier;