diff --git a/docs/docs/aztec/concepts/smart_contracts/oracles/index.md b/docs/docs/aztec/concepts/smart_contracts/oracles/index.md
index f21cacc1a73e..fd36f37b7066 100644
--- a/docs/docs/aztec/concepts/smart_contracts/oracles/index.md
+++ b/docs/docs/aztec/concepts/smart_contracts/oracles/index.md
@@ -18,7 +18,7 @@ If we fetch the notes using an oracle call, we can keep the function signature i
 Oracles introduce **non-determinism** into a circuit, and thus are `unconstrained`. It is important that any information that is injected into a circuit through an oracle is later constrained for correctness. Otherwise, the circuit will be **under-constrained** and potentially insecure!
 
 `Aztec.nr` has a module dedicated to its oracles. If you are interested, you can view them by following the link below:
-#include_code oracles-module /noir-projects/aztec-nr/aztec/src/oracle.nr rust
+#include_code oracles-module /noir-projects/aztec-nr/aztec/src/oracle/mod.nr rust
 
 ## Inbuilt oracles
 
diff --git a/noir-projects/aztec-nr/authwit/src/entrypoint.nr b/noir-projects/aztec-nr/authwit/src/entrypoint/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/authwit/src/entrypoint.nr
rename to noir-projects/aztec-nr/authwit/src/entrypoint/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/context/globals.nr b/noir-projects/aztec-nr/aztec/src/context/globals/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/context/globals.nr
rename to noir-projects/aztec-nr/aztec/src/context/globals/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/context/inputs.nr b/noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/context/inputs.nr
rename to noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/context.nr b/noir-projects/aztec-nr/aztec/src/context/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/context.nr
rename to noir-projects/aztec-nr/aztec/src/context/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/encrypted_logs.nr b/noir-projects/aztec-nr/aztec/src/encrypted_logs/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/encrypted_logs.nr
rename to noir-projects/aztec-nr/aztec/src/encrypted_logs/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/event.nr b/noir-projects/aztec-nr/aztec/src/event/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/event.nr
rename to noir-projects/aztec-nr/aztec/src/event/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/history.nr b/noir-projects/aztec-nr/aztec/src/history/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/history.nr
rename to noir-projects/aztec-nr/aztec/src/history/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/keys.nr b/noir-projects/aztec-nr/aztec/src/keys/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/keys.nr
rename to noir-projects/aztec-nr/aztec/src/keys/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/note.nr b/noir-projects/aztec-nr/aztec/src/note/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/note.nr
rename to noir-projects/aztec-nr/aztec/src/note/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_getter.nr b/noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/note/note_getter.nr
rename to noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/oracle.nr b/noir-projects/aztec-nr/aztec/src/oracle/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/oracle.nr
rename to noir-projects/aztec-nr/aztec/src/oracle/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars.nr b/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/state_vars.nr
rename to noir-projects/aztec-nr/aztec/src/state_vars/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/test/helpers.nr
rename to noir-projects/aztec-nr/aztec/src/test/helpers/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/test/mocks.nr b/noir-projects/aztec-nr/aztec/src/test/mocks/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/test/mocks.nr
rename to noir-projects/aztec-nr/aztec/src/test/mocks/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/test.nr b/noir-projects/aztec-nr/aztec/src/test/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/test.nr
rename to noir-projects/aztec-nr/aztec/src/test/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/unencrypted_logs.nr b/noir-projects/aztec-nr/aztec/src/unencrypted_logs/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/unencrypted_logs.nr
rename to noir-projects/aztec-nr/aztec/src/unencrypted_logs/mod.nr
diff --git a/noir-projects/aztec-nr/aztec/src/utils.nr b/noir-projects/aztec-nr/aztec/src/utils/mod.nr
similarity index 100%
rename from noir-projects/aztec-nr/aztec/src/utils.nr
rename to noir-projects/aztec-nr/aztec/src/utils/mod.nr
diff --git a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events.nr b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/mod.nr
similarity index 100%
rename from noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events.nr
rename to noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/mod.nr
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/mod.nr
similarity index 100%
rename from noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types.nr
rename to noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/parity-lib/src/base.nr
rename to noir-projects/noir-protocol-circuits/crates/parity-lib/src/base/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/parity-lib/src/root.nr
rename to noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils.nr
rename to noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_call_data_validator_builder.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_call_data_validator_builder/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_call_data_validator_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_call_data_validator_builder/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_output_validator_builder.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_output_validator_builder/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_output_validator_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_output_validator_builder/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_public_inputs_composer_builder.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_public_inputs_composer_builder/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_public_inputs_composer_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_circuit_public_inputs_composer_builder/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/tail_output_validator_builder.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/tail_output_validator_builder/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/tail_output_validator_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/tail_output_validator_builder/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/reset.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/reset/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/reset.nr
rename to noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/reset/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests.nr
rename to noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/abis.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/address.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/address.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/contrakt.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contrakt/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/contrakt.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/contrakt/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/data/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/data/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/messaging.nr b/noir-projects/noir-protocol-circuits/crates/types/src/messaging/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/messaging.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/messaging/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/recursion.nr b/noir-projects/noir-protocol-circuits/crates/types/src/recursion/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/recursion.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/recursion/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/storage.nr b/noir-projects/noir-protocol-circuits/crates/types/src/storage/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/storage.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/storage/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/tests.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/transaction.nr b/noir-projects/noir-protocol-circuits/crates/types/src/transaction/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/transaction.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/transaction/mod.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/utils.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/mod.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/crates/types/src/utils.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/utils/mod.nr