diff --git a/evm/src/cpu/kernel/context_metadata.rs b/evm/src/cpu/kernel/constants/context_metadata.rs
similarity index 100%
rename from evm/src/cpu/kernel/context_metadata.rs
rename to evm/src/cpu/kernel/constants/context_metadata.rs
diff --git a/evm/src/cpu/kernel/global_metadata.rs b/evm/src/cpu/kernel/constants/global_metadata.rs
similarity index 100%
rename from evm/src/cpu/kernel/global_metadata.rs
rename to evm/src/cpu/kernel/constants/global_metadata.rs
diff --git a/evm/src/cpu/kernel/constants/mod.rs b/evm/src/cpu/kernel/constants/mod.rs
index 2694b82a..b10eced1 100644
--- a/evm/src/cpu/kernel/constants/mod.rs
+++ b/evm/src/cpu/kernel/constants/mod.rs
@@ -4,13 +4,16 @@ use ethereum_types::U256;
 use hex_literal::hex;
 
 use crate::cpu::decode::invalid_opcodes_user;
+use crate::cpu::kernel::constants::context_metadata::ContextMetadata;
+use crate::cpu::kernel::constants::global_metadata::GlobalMetadata;
 use crate::cpu::kernel::constants::trie_type::PartialTrieType;
-use crate::cpu::kernel::context_metadata::ContextMetadata;
-use crate::cpu::kernel::global_metadata::GlobalMetadata;
-use crate::cpu::kernel::txn_fields::NormalizedTxnField;
+use crate::cpu::kernel::constants::txn_fields::NormalizedTxnField;
 use crate::memory::segments::Segment;
 
+pub(crate) mod context_metadata;
+pub(crate) mod global_metadata;
 pub(crate) mod trie_type;
+pub(crate) mod txn_fields;
 
 /// Constants that are accessible to our kernel assembly code.
 pub fn evm_constants() -> HashMap<String, U256> {
diff --git a/evm/src/cpu/kernel/txn_fields.rs b/evm/src/cpu/kernel/constants/txn_fields.rs
similarity index 100%
rename from evm/src/cpu/kernel/txn_fields.rs
rename to evm/src/cpu/kernel/constants/txn_fields.rs
diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs
index 45211848..343f9773 100644
--- a/evm/src/cpu/kernel/interpreter.rs
+++ b/evm/src/cpu/kernel/interpreter.rs
@@ -7,8 +7,8 @@ use plonky2::field::goldilocks_field::GoldilocksField;
 
 use crate::cpu::kernel::aggregator::KERNEL;
 use crate::cpu::kernel::assembler::Kernel;
-use crate::cpu::kernel::global_metadata::GlobalMetadata;
-use crate::cpu::kernel::txn_fields::NormalizedTxnField;
+use crate::cpu::kernel::constants::global_metadata::GlobalMetadata;
+use crate::cpu::kernel::constants::txn_fields::NormalizedTxnField;
 use crate::generation::memory::{MemoryContextState, MemorySegmentState};
 use crate::generation::prover_input::ProverInputFn;
 use crate::generation::state::GenerationState;
diff --git a/evm/src/cpu/kernel/mod.rs b/evm/src/cpu/kernel/mod.rs
index e14a6cd6..4704a193 100644
--- a/evm/src/cpu/kernel/mod.rs
+++ b/evm/src/cpu/kernel/mod.rs
@@ -2,15 +2,12 @@ pub mod aggregator;
 pub mod assembler;
 mod ast;
 pub(crate) mod constants;
-pub(crate) mod context_metadata;
 mod cost_estimator;
-pub(crate) mod global_metadata;
 pub(crate) mod keccak_util;
 mod opcodes;
 mod optimizer;
 mod parser;
 pub mod stack;
-mod txn_fields;
 mod utils;
 
 #[cfg(test)]
diff --git a/evm/src/cpu/kernel/tests/core/intrinsic_gas.rs b/evm/src/cpu/kernel/tests/core/intrinsic_gas.rs
index cc96f955..d84002ae 100644
--- a/evm/src/cpu/kernel/tests/core/intrinsic_gas.rs
+++ b/evm/src/cpu/kernel/tests/core/intrinsic_gas.rs
@@ -1,8 +1,8 @@
 use anyhow::Result;
 
 use crate::cpu::kernel::aggregator::KERNEL;
+use crate::cpu::kernel::constants::txn_fields::NormalizedTxnField;
 use crate::cpu::kernel::interpreter::Interpreter;
-use crate::cpu::kernel::txn_fields::NormalizedTxnField;
 
 const GAS_TX: u32 = 21_000;
 const GAS_TXCREATE: u32 = 32_000;
diff --git a/evm/src/cpu/kernel/tests/mpt/load.rs b/evm/src/cpu/kernel/tests/mpt/load.rs
index fbbc690a..12f10b7b 100644
--- a/evm/src/cpu/kernel/tests/mpt/load.rs
+++ b/evm/src/cpu/kernel/tests/mpt/load.rs
@@ -2,8 +2,8 @@ use anyhow::Result;
 use ethereum_types::U256;
 
 use crate::cpu::kernel::aggregator::KERNEL;
+use crate::cpu::kernel::constants::global_metadata::GlobalMetadata;
 use crate::cpu::kernel::constants::trie_type::PartialTrieType;
-use crate::cpu::kernel::global_metadata::GlobalMetadata;
 use crate::cpu::kernel::interpreter::Interpreter;
 use crate::cpu::kernel::tests::mpt::state_trie_ext_to_account_leaf;
 use crate::generation::mpt::all_mpt_prover_inputs_reversed;
diff --git a/evm/src/cpu/kernel/tests/mpt/read.rs b/evm/src/cpu/kernel/tests/mpt/read.rs
index e20aa0fe..39cf8091 100644
--- a/evm/src/cpu/kernel/tests/mpt/read.rs
+++ b/evm/src/cpu/kernel/tests/mpt/read.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use ethereum_types::U256;
 
 use crate::cpu::kernel::aggregator::KERNEL;
-use crate::cpu::kernel::global_metadata::GlobalMetadata;
+use crate::cpu::kernel::constants::global_metadata::GlobalMetadata;
 use crate::cpu::kernel::interpreter::Interpreter;
 use crate::cpu::kernel::tests::mpt::state_trie_ext_to_account_leaf;
 use crate::generation::mpt::all_mpt_prover_inputs_reversed;
diff --git a/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs b/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
index 53a3d282..5976acaf 100644
--- a/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
+++ b/evm/src/cpu/kernel/tests/transaction_parsing/parse_type_0_txn.rs
@@ -4,8 +4,8 @@ use hex_literal::hex;
 use NormalizedTxnField::*;
 
 use crate::cpu::kernel::aggregator::KERNEL;
+use crate::cpu::kernel::constants::txn_fields::NormalizedTxnField;
 use crate::cpu::kernel::interpreter::Interpreter;
-use crate::cpu::kernel::txn_fields::NormalizedTxnField;
 
 #[test]
 fn process_type_0_txn() -> Result<()> {
diff --git a/evm/src/generation/mod.rs b/evm/src/generation/mod.rs
index 11fbd879..be932c5c 100644
--- a/evm/src/generation/mod.rs
+++ b/evm/src/generation/mod.rs
@@ -13,7 +13,7 @@ use crate::all_stark::{AllStark, NUM_TABLES};
 use crate::config::StarkConfig;
 use crate::cpu::bootstrap_kernel::generate_bootstrap_kernel;
 use crate::cpu::columns::NUM_CPU_COLUMNS;
-use crate::cpu::kernel::global_metadata::GlobalMetadata;
+use crate::cpu::kernel::constants::global_metadata::GlobalMetadata;
 use crate::generation::state::GenerationState;
 use crate::memory::segments::Segment;
 use crate::memory::NUM_CHANNELS;