diff --git a/src/ast_types/tuple.rs b/src/ast_types/tuple.rs
index 0e0fc537..247501b1 100644
--- a/src/ast_types/tuple.rs
+++ b/src/ast_types/tuple.rs
@@ -1,5 +1,5 @@
-use crate::triton_vm::triton_asm;
 use itertools::Itertools;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast::FnSignature;
 use crate::libraries::LibraryFunction;
diff --git a/src/lib.rs b/src/lib.rs
index a9ddb5f2..71bcf279 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,11 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
 use std::fs::File;
 use std::io::Read;
 use std::process;
+
+use itertools::Itertools;
 use syn::ImplItemMethod;
 use syn::Item;
 use syn::ItemEnum;
@@ -12,13 +13,12 @@ use syn::ItemImpl;
 use syn::ItemStruct;
 use syn::UseTree;
 pub use tasm_lib;
-use tasm_lib::prelude::*;
-use tasm_lib::triton_vm::prelude::*;
-
-// TODO: The following import is necessary until `tasm-lib` branch `prelude` is incorporated there.
-#[allow(clippy::single_component_path_imports)]
+pub use tasm_lib::triton_vm;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+pub use tasm_lib::twenty_first;
+// todo: this is temporarily required for derive macro `TasmObject` until its code generation is cleaned up
 #[allow(unused_imports)]
-use twenty_first;
+use tasm_lib::twenty_first::prelude::BFieldElement;
 
 use ast_types::ListType;
 use graft::CustomTypeRust;
diff --git a/src/libraries/bfe.rs b/src/libraries/bfe.rs
index 69b7ec2e..ff3fc19c 100644
--- a/src/libraries/bfe.rs
+++ b/src/libraries/bfe.rs
@@ -1,14 +1,13 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 use itertools::Itertools;
 use num::One;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
 use crate::graft::Graft;
 use crate::subroutine::SubRoutine;
+use crate::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
 use super::tasm_lib_snippet_to_fn_signature;
 use super::Library;
diff --git a/src/libraries/bfield_codec.rs b/src/libraries/bfield_codec.rs
index 4206c46f..c71c4ea1 100644
--- a/src/libraries/bfield_codec.rs
+++ b/src/libraries/bfield_codec.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use tasm_lib::memory::dyn_malloc;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/libraries/boxed.rs b/src/libraries/boxed.rs
index c17633dc..d7ed8ee5 100644
--- a/src/libraries/boxed.rs
+++ b/src/libraries/boxed.rs
@@ -1,7 +1,7 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use num::One;
 use tasm_lib::memory::dyn_malloc::DynMalloc;
+use tasm_lib::triton_vm::prelude::triton_asm;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/libraries/core.rs b/src/libraries/core.rs
index e4780c32..04d849c6 100644
--- a/src/libraries/core.rs
+++ b/src/libraries/core.rs
@@ -1,7 +1,7 @@
-use crate::LabelledInstruction;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
 use syn::ExprMethodCall;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
 
 use crate::ast::Expr;
 use crate::ast::FnSignature;
diff --git a/src/libraries/core/option_type.rs b/src/libraries/core/option_type.rs
index 25606591..b2f962a9 100644
--- a/src/libraries/core/option_type.rs
+++ b/src/libraries/core/option_type.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::triton_asm;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;
diff --git a/src/libraries/core/result_type.rs b/src/libraries/core/result_type.rs
index 823aaf48..d7cf9a67 100644
--- a/src/libraries/core/result_type.rs
+++ b/src/libraries/core/result_type.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::triton_asm;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;
diff --git a/src/libraries/hasher.rs b/src/libraries/hasher.rs
index d161ef18..8d64346f 100644
--- a/src/libraries/hasher.rs
+++ b/src/libraries/hasher.rs
@@ -1,7 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::tip5::DIGEST_LENGTH;
-use crate::LabelledInstruction;
-use tasm_lib::Digest;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::tip5::DIGEST_LENGTH;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/libraries/tasm.rs b/src/libraries/tasm.rs
index 8a115b80..04b8ac11 100644
--- a/src/libraries/tasm.rs
+++ b/src/libraries/tasm.rs
@@ -1,8 +1,9 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::ast;
 use crate::ast_types;
 use crate::graft::Graft;
 use crate::tasm_code_generator::CompilerState;
-use crate::triton_vm::prelude::*;
 
 use super::tasm_lib_snippet_to_fn_signature;
 use super::Library;
diff --git a/src/libraries/unsigned_integers.rs b/src/libraries/unsigned_integers.rs
index d47e6480..691d4e2e 100644
--- a/src/libraries/unsigned_integers.rs
+++ b/src/libraries/unsigned_integers.rs
@@ -1,5 +1,5 @@
-use crate::triton_vm::prelude::*;
 use tasm_lib::traits::basic_snippet::BasicSnippet;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/libraries/vector.rs b/src/libraries/vector.rs
index ed75f757..fb36fc9e 100644
--- a/src/libraries/vector.rs
+++ b/src/libraries/vector.rs
@@ -1,9 +1,9 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use itertools::Itertools;
 use num::One;
 use tasm_lib::memory::memcpy::MemCpy;
 use tasm_lib::traits::basic_snippet::BasicSnippet;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;
diff --git a/src/libraries/xfe.rs b/src/libraries/xfe.rs
index 68bcc688..475b03ba 100644
--- a/src/libraries/xfe.rs
+++ b/src/libraries/xfe.rs
@@ -1,10 +1,8 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::EXTENSION_DEGREE;
 use itertools::Itertools;
 use num::One;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::x_field_element::EXTENSION_DEGREE;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/tasm_code_generator.rs b/src/tasm_code_generator.rs
index cb868e22..3da8f424 100644
--- a/src/tasm_code_generator.rs
+++ b/src/tasm_code_generator.rs
@@ -13,7 +13,7 @@ use std::fmt::Display;
 use tasm_lib::library::Library as SnippetState;
 use tasm_lib::prelude::*;
 use tasm_lib::triton_vm::prelude::*;
-use tasm_lib::triton_vm::twenty_first::prelude::*;
+use tasm_lib::twenty_first::prelude::*;
 
 use self::function_state::FunctionState;
 use self::function_state::VarAddr;
diff --git a/src/tasm_code_generator/data_type.rs b/src/tasm_code_generator/data_type.rs
index 54184ed2..24668431 100644
--- a/src/tasm_code_generator/data_type.rs
+++ b/src/tasm_code_generator/data_type.rs
@@ -1,8 +1,6 @@
-use crate::triton_vm::op_stack::OpStackElement;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use tasm_lib::memory::memcpy::MemCpy;
+use tasm_lib::triton_vm::op_stack::OpStackElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 use crate::tasm_code_generator::read_n_words_from_memory;
diff --git a/src/tasm_code_generator/data_type/array_type.rs b/src/tasm_code_generator/data_type/array_type.rs
index cc820dfd..63d01ea6 100644
--- a/src/tasm_code_generator/data_type/array_type.rs
+++ b/src/tasm_code_generator/data_type/array_type.rs
@@ -1,12 +1,15 @@
-use crate::ast::{self, ArrayExpression};
-use crate::tasm_code_generator::{
-    compile_expr, pop_n, write_n_words_to_memory_leaving_address, CompilerState,
-};
-use crate::triton_vm::triton_asm;
-use crate::type_checker::GetType;
-use crate::LabelledInstruction;
-use crate::{ast_types, type_checker};
 use itertools::Itertools;
+use tasm_lib::triton_vm::prelude::*;
+
+use crate::ast;
+use crate::ast::ArrayExpression;
+use crate::ast_types;
+use crate::tasm_code_generator::compile_expr;
+use crate::tasm_code_generator::pop_n;
+use crate::tasm_code_generator::write_n_words_to_memory_leaving_address;
+use crate::tasm_code_generator::CompilerState;
+use crate::type_checker;
+use crate::type_checker::GetType;
 
 pub(crate) fn compile_array_expr(
     state: &mut CompilerState,
diff --git a/src/tasm_code_generator/data_type/enum_type.rs b/src/tasm_code_generator/data_type/enum_type.rs
index 84f89470..e3b53808 100644
--- a/src/tasm_code_generator/data_type/enum_type.rs
+++ b/src/tasm_code_generator/data_type/enum_type.rs
@@ -1,7 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::triton_instr;
-use crate::LabelledInstruction;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/tasm_code_generator/data_type/struct_type.rs b/src/tasm_code_generator/data_type/struct_type.rs
index 11541411..0746cb2b 100644
--- a/src/tasm_code_generator/data_type/struct_type.rs
+++ b/src/tasm_code_generator/data_type/struct_type.rs
@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::triton_instr;
-use crate::LabelledInstruction;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 use crate::ast_types::StructVariant;
diff --git a/src/tasm_code_generator/data_type/tuple_type.rs b/src/tasm_code_generator/data_type/tuple_type.rs
index 30781dec..673bf8e5 100644
--- a/src/tasm_code_generator/data_type/tuple_type.rs
+++ b/src/tasm_code_generator/data_type/tuple_type.rs
@@ -1,7 +1,9 @@
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
+
 use crate::ast_types::Tuple;
-use crate::tasm_code_generator::{move_top_stack_value_to_memory, CompilerState};
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
+use crate::tasm_code_generator::move_top_stack_value_to_memory;
+use crate::tasm_code_generator::CompilerState;
 
 impl Tuple {
     /// ```text
diff --git a/src/tasm_code_generator/inner_function_tasm_code.rs b/src/tasm_code_generator/inner_function_tasm_code.rs
index 172a19e6..9478ef74 100644
--- a/src/tasm_code_generator/inner_function_tasm_code.rs
+++ b/src/tasm_code_generator/inner_function_tasm_code.rs
@@ -1,5 +1,6 @@
+use tasm_lib::triton_vm::triton_asm;
+
 use crate::subroutine::SubRoutine;
-use crate::triton_vm::triton_asm;
 
 #[derive(Clone, Debug)]
 pub(crate) struct InnerFunctionTasmCode {
diff --git a/src/tasm_code_generator/match_code.rs b/src/tasm_code_generator/match_code.rs
index 4d044b83..dc0a9679 100644
--- a/src/tasm_code_generator/match_code.rs
+++ b/src/tasm_code_generator/match_code.rs
@@ -1,14 +1,10 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
+use std::collections::HashSet;
+
 use itertools::Itertools;
 use num::One;
-use std::collections::HashSet;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
 
-use super::compile_block_stmt;
-use super::compile_returning_block_expr;
-use super::pop_n;
-use super::CompilerState;
-use super::ValueIdentifier;
 use crate::ast;
 use crate::ast::MatchCondition;
 use crate::ast::MatchExpr;
@@ -18,6 +14,12 @@ use crate::type_checker;
 use crate::type_checker::GetType;
 use crate::type_checker::Typing;
 
+use super::compile_block_stmt;
+use super::compile_returning_block_expr;
+use super::pop_n;
+use super::CompilerState;
+use super::ValueIdentifier;
+
 impl MatchExpr<Typing> {
     /// Return the code that evaluates to true iff the catch-all branch in a match statement
     /// should be taken.
diff --git a/src/tasm_code_generator/outer_function_tasm_code.rs b/src/tasm_code_generator/outer_function_tasm_code.rs
index 1a3de47c..f50d72b2 100644
--- a/src/tasm_code_generator/outer_function_tasm_code.rs
+++ b/src/tasm_code_generator/outer_function_tasm_code.rs
@@ -1,14 +1,12 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
-use crate::triton_vm::instruction;
-use crate::triton_vm::op_stack::NumberOfWords;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use chrono::Local;
 use itertools::Itertools;
 use tasm_lib::library::Library as SnippetState;
+use tasm_lib::triton_vm::instruction;
+use tasm_lib::triton_vm::op_stack::NumberOfWords;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
diff --git a/src/tasm_code_generator/stack.rs b/src/tasm_code_generator/stack.rs
index 457cd52c..c6511e43 100644
--- a/src/tasm_code_generator/stack.rs
+++ b/src/tasm_code_generator/stack.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::LabelledInstruction;
 use itertools::Itertools;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 
diff --git a/src/tests_and_benchmarks/benchmarks.rs b/src/tests_and_benchmarks/benchmarks.rs
index 5a33e1b6..d7fdf560 100644
--- a/src/tests_and_benchmarks/benchmarks.rs
+++ b/src/tests_and_benchmarks/benchmarks.rs
@@ -3,6 +3,7 @@ use std::fs::create_dir_all;
 use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
+
 use tasm_lib::snippet_bencher::write_benchmarks;
 use tasm_lib::snippet_bencher::BenchmarkCase;
 use tasm_lib::snippet_bencher::BenchmarkResult;
diff --git a/src/tests_and_benchmarks/benchmarks/mmr.rs b/src/tests_and_benchmarks/benchmarks/mmr.rs
index 1abc39b6..ec88870d 100644
--- a/src/tests_and_benchmarks/benchmarks/mmr.rs
+++ b/src/tests_and_benchmarks/benchmarks/mmr.rs
@@ -2,14 +2,13 @@
 mod benchmark {
     use std::collections::HashMap;
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::tip5::Tip5;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_trait::Mmr;
-
     use rand::random;
     use tasm_lib::rust_shadowing_helper_functions;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::tip5::Tip5;
+    use tasm_lib::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use tasm_lib::twenty_first::util_types::mmr::mmr_trait::Mmr;
     use tasm_lib::Digest;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;
diff --git a/src/tests_and_benchmarks/ozk/ozk_parsing.rs b/src/tests_and_benchmarks/ozk/ozk_parsing.rs
index 12530a1b..33ab7df1 100644
--- a/src/tests_and_benchmarks/ozk/ozk_parsing.rs
+++ b/src/tests_and_benchmarks/ozk/ozk_parsing.rs
@@ -4,9 +4,9 @@ use crate::ast_types;
 use crate::custom_type_resolver::resolve_custom_types;
 use crate::extract_types_and_function;
 use crate::tasm_code_generator::compile_function;
-use crate::triton_vm::prelude::*;
 use crate::type_checker::annotate_fn_outer;
 use crate::StructsAndMethodsRustAst;
+use tasm_lib::triton_vm::prelude::*;
 
 const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
 const PROGRAMS_DIR: &str = "src/tests_and_benchmarks/ozk/programs";
diff --git a/src/tests_and_benchmarks/ozk/programs/arithmetic/bfe_add.rs b/src/tests_and_benchmarks/ozk/programs/arithmetic/bfe_add.rs
index f4a1dbd3..164a2120 100644
--- a/src/tests_and_benchmarks/ozk/programs/arithmetic/bfe_add.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arithmetic/bfe_add.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/arithmetic/dazefield_element_mul.rs b/src/tests_and_benchmarks/ozk/programs/arithmetic/dazefield_element_mul.rs
index 52744c91..1a93b4e0 100644
--- a/src/tests_and_benchmarks/ozk/programs/arithmetic/dazefield_element_mul.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arithmetic/dazefield_element_mul.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -56,8 +56,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use proptest::collection::vec;
     use proptest::prelude::*;
@@ -92,7 +91,7 @@ mod test {
 }
 
 mod benches {
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;
     use crate::tests_and_benchmarks::benchmarks::profile;
diff --git a/src/tests_and_benchmarks/ozk/programs/arithmetic/mod_pow_u32.rs b/src/tests_and_benchmarks/ozk/programs/arithmetic/mod_pow_u32.rs
index 14bfc5e2..471ff7f3 100644
--- a/src/tests_and_benchmarks/ozk/programs/arithmetic/mod_pow_u32.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arithmetic/mod_pow_u32.rs
@@ -1,6 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::traits::ModPowU32;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::shared_math::traits::ModPowU32;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/arithmetic/montyred.rs b/src/tests_and_benchmarks/ozk/programs/arithmetic/montyred.rs
index 58c04a1c..41c562cd 100644
--- a/src/tests_and_benchmarks/ozk/programs/arithmetic/montyred.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arithmetic/montyred.rs
@@ -54,8 +54,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array.rs b/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array.rs
index 4b173683..a0428105 100644
--- a/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array.rs
@@ -1,5 +1,5 @@
-use crate::triton_vm::prelude::*;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -53,7 +53,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array_boxed.rs b/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array_boxed.rs
index 649e76a3..71fed563 100644
--- a/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array_boxed.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arrays/bfe_array_boxed.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -44,7 +44,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/arrays/repeat_syntax.rs b/src/tests_and_benchmarks/ozk/programs/arrays/repeat_syntax.rs
index 4dd5a490..ab856ad4 100644
--- a/src/tests_and_benchmarks/ozk/programs/arrays/repeat_syntax.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arrays/repeat_syntax.rs
@@ -2,9 +2,8 @@ use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 use crate::tests_and_benchmarks::ozk::rust_shadows;
 use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
-use crate::triton_vm::prelude::*;
 use crate::twenty_first::shared_math::other::random_elements;
-use crate::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 fn call_constructor_once() {
     fn construct_xfe_4_array(xfe: XFieldElement) -> [XFieldElement; 4] {
diff --git a/src/tests_and_benchmarks/ozk/programs/arrays/xfe_array.rs b/src/tests_and_benchmarks/ozk/programs/arrays/xfe_array.rs
index 17594ceb..be8b22e1 100644
--- a/src/tests_and_benchmarks/ozk/programs/arrays/xfe_array.rs
+++ b/src/tests_and_benchmarks/ozk/programs/arrays/xfe_array.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -55,8 +54,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/bfe.rs b/src/tests_and_benchmarks/ozk/programs/boxed/bfe.rs
index 367c5788..134176c2 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/bfe.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/bfe.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/bfe_pair.rs b/src/tests_and_benchmarks/ozk/programs/boxed/bfe_pair.rs
index fe8408bd..05b1e073 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/bfe_pair.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/bfe_pair.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_list_simple.rs b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_list_simple.rs
index 7c452169..834301c7 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_list_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_list_simple.rs
@@ -4,7 +4,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     fn main() {
         let mut list: Vec<BFieldElement> = Vec::<BFieldElement>::with_capacity(32);
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_list_field_simple.rs b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_list_field_simple.rs
index ad7c5267..b9e9958c 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_list_field_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_list_field_simple.rs
@@ -1,6 +1,6 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
 #[derive(BFieldCodec)]
 struct WithListField {
@@ -23,11 +23,12 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
+    use super::*;
+
     #[test]
     fn box_a_struct_with_list_field_simple() {
         let native_output =
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_two_list_fields.rs b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_two_list_fields.rs
index 0942e05a..381c62db 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_two_list_fields.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/box_a_struct_with_two_list_fields.rs
@@ -1,6 +1,6 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::{bfield_codec::BFieldCodec, x_field_element::XFieldElement};
 
 #[derive(BFieldCodec)]
 struct WithListFields {
@@ -31,13 +31,13 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-
     use crate::twenty_first::shared_math::other::random_elements;
 
+    use super::*;
+
     #[test]
     fn box_a_struct_with_two_list_fields() {
         let stdin = random_elements(6);
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/box_an_array_simple.rs b/src/tests_and_benchmarks/ozk/programs/boxed/box_an_array_simple.rs
index dbd41002..3ae07e9d 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/box_an_array_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/box_an_array_simple.rs
@@ -4,7 +4,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     fn main() {
         let array: [BFieldElement; 2] = [BFieldElement::new(101), BFieldElement::new(102)];
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/box_complex_flat_struct.rs b/src/tests_and_benchmarks/ozk/programs/boxed/box_complex_flat_struct.rs
index 406bb439..506361e7 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/box_complex_flat_struct.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/box_complex_flat_struct.rs
@@ -1,8 +1,10 @@
-use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::{bfield_codec::BFieldCodec, x_field_element::XFieldElement};
+use tasm_lib::triton_vm::prelude::*;
 use tasm_lib::Digest;
 
+use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
+use tasm_lib::twenty_first::prelude::BFieldCodec;
+use tasm_lib::twenty_first::prelude::XFieldElement;
+
 #[derive(Debug, Clone, PartialEq, Eq, BFieldCodec)]
 struct WithListFields {
     bfes: Vec<BFieldElement>,
@@ -67,13 +69,13 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
-
     use crate::twenty_first::shared_math::other::random_elements;
 
+    use super::*;
+
     #[test]
     fn box_complex_flat_struct_test() {
         let non_determinism = NonDeterminism::default();
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/digest_pair.rs b/src/tests_and_benchmarks/ozk/programs/boxed/digest_pair.rs
index b34570fa..55731016 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/digest_pair.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/digest_pair.rs
@@ -1,5 +1,5 @@
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 fn main() {
     let a: Digest = tasm::tasm_io_read_stdin___digest();
@@ -38,8 +38,8 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::prelude::BFieldCodec;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/enum_to_memory_simple.rs b/src/tests_and_benchmarks/ozk/programs/boxed/enum_to_memory_simple.rs
index 2e34cd01..a30b3425 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/enum_to_memory_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/enum_to_memory_simple.rs
@@ -1,8 +1,8 @@
-use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
 use arbitrary::Arbitrary;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
+
+use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
 #[derive(Debug, Clone, PartialEq, Eq, BFieldCodec, Arbitrary)]
 enum SimpleEnum {
@@ -109,12 +109,13 @@ fn in_memory_c() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use itertools::Itertools;
+
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
-    use itertools::Itertools;
+    use super::*;
 
     #[test]
     fn enum_to_memory_simple_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/flat_tuples.rs b/src/tests_and_benchmarks/ozk/programs/boxed/flat_tuples.rs
index d82d9bfa..1bdbe150 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/flat_tuples.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/flat_tuples.rs
@@ -1,5 +1,5 @@
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 #[derive(Clone, Copy)]
 struct TupleStructA(u128, u64, Digest);
@@ -185,7 +185,7 @@ fn main() {
 #[cfg(test)]
 mod tests {
 
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::twenty_first::prelude::BFieldCodec;
 
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/method_on_nested_struct_simple.rs b/src/tests_and_benchmarks/ozk/programs/boxed/method_on_nested_struct_simple.rs
index c9dd0740..a76f8b4d 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/method_on_nested_struct_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/method_on_nested_struct_simple.rs
@@ -24,7 +24,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn methods_on_nested_structs_simple_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_boxed_tuple_structs.rs b/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_boxed_tuple_structs.rs
index f437b143..35b8e7ef 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_boxed_tuple_structs.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_boxed_tuple_structs.rs
@@ -26,14 +26,14 @@ fn main() {
 
 #[cfg(test)]
 mod test {
+    use itertools::Itertools;
+    use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
+
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-    use itertools::Itertools;
-    use rand::random;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_nested_structs_not_copy.rs b/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_nested_structs_not_copy.rs
index 41a75c5b..a6a35a44 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_nested_structs_not_copy.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/methods_on_nested_structs_not_copy.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 use tasm_lib::Digest;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
@@ -65,7 +65,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::twenty_first::prelude::BFieldCodec;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/nested_tuples.rs b/src/tests_and_benchmarks/ozk/programs/boxed/nested_tuples.rs
index 05b3570b..a2ddc5b0 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/nested_tuples.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/nested_tuples.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -82,7 +82,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::twenty_first::prelude::BFieldCodec;
 
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/ref_struct_typecheck_succeed_bc_boxed.rs b/src/tests_and_benchmarks/ozk/programs/boxed/ref_struct_typecheck_succeed_bc_boxed.rs
index 04a39f27..54fccee4 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/ref_struct_typecheck_succeed_bc_boxed.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/ref_struct_typecheck_succeed_bc_boxed.rs
@@ -24,16 +24,16 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use itertools::Itertools;
+    use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
+
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
-    use itertools::Itertools;
-    use rand::random;
+    use super::*;
 
     #[test]
     fn ref_struct_typecheck_succeed_bc_boxed_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/simple_struct_copy.rs b/src/tests_and_benchmarks/ozk/programs/boxed/simple_struct_copy.rs
index cef06db3..06b82eb4 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/simple_struct_copy.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/simple_struct_copy.rs
@@ -1,4 +1,4 @@
-use crate::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::twenty_first::prelude::XFieldElement;
 use tasm_lib::Digest;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
@@ -30,8 +30,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
-    use crate::triton_vm::prelude::*;
     use crate::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn boxed_simple_copy_struct() {
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_one_element.rs b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_one_element.rs
index 4c219223..0d992681 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_one_element.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_one_element.rs
@@ -34,13 +34,12 @@ fn main() {
 mod test {
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_copy.rs b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_copy.rs
index 3b1db5ce..4101fda5 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_copy.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_copy.rs
@@ -29,13 +29,12 @@ fn main() {
 mod test {
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_not_copy.rs b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_not_copy.rs
index 07294efa..4b6d265f 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_not_copy.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_two_elements_not_copy.rs
@@ -23,16 +23,14 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_with_vec.rs b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_with_vec.rs
index cdd7c98e..5a7997b7 100644
--- a/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_with_vec.rs
+++ b/src/tests_and_benchmarks/ozk/programs/boxed/tuple_struct_with_vec.rs
@@ -1,7 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -20,7 +18,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use arbitrary::Unstructured;
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_dyn_sized_variant_field.rs b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_dyn_sized_variant_field.rs
index 849335ea..58f00dfe 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_dyn_sized_variant_field.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_dyn_sized_variant_field.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_simple.rs b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_simple.rs
index 446c6ea8..20b73921 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_simple.rs
@@ -36,13 +36,15 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use self::tasm::wrap_main_with_io;
-    use super::*;
+    use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
+
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
-    use crate::triton_vm::prelude::*;
-    use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
-    use rand::random;
+
+    use super::*;
+
+    use self::tasm::wrap_main_with_io;
 
     #[test]
     fn box_enum_simple_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_two_dyn_sized_variant_fields.rs b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_two_dyn_sized_variant_fields.rs
index 8c437857..f226ebf5 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/box_enum_two_dyn_sized_variant_fields.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/box_enum_two_dyn_sized_variant_fields.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::x_field_element::XFieldElement;
-use tasm_lib::Digest;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/boxed_advanced_tuple_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/boxed_advanced_tuple_data.rs
index 42d92e1d..4b1899c7 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/boxed_advanced_tuple_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/boxed_advanced_tuple_data.rs
@@ -1,9 +1,7 @@
 #![allow(clippy::len_zero)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 use tasm_lib::Digest;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
@@ -112,11 +110,10 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use arbitrary::Unstructured;
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/boxed_match_with_wildcard_binding.rs b/src/tests_and_benchmarks/ozk/programs/enums/boxed_match_with_wildcard_binding.rs
index a66312e2..115b99cf 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/boxed_match_with_wildcard_binding.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/boxed_match_with_wildcard_binding.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -36,7 +35,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use itertools::Itertools;
     use rand::random;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data.rs
index ea176c65..6278b7d9 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data_to_stack.rs b/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data_to_stack.rs
index 2c9aac24..f35b5acf 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data_to_stack.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/boxed_multiple_tuple_data_to_stack.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/boxed_proof_item_simple.rs b/src/tests_and_benchmarks/ozk/programs/enums/boxed_proof_item_simple.rs
index e356fddf..f1d4f3ed 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/boxed_proof_item_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/boxed_proof_item_simple.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use num::Zero;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/custom_struct_in_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/custom_struct_in_data.rs
index 707bae10..9c3bbda0 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/custom_struct_in_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/custom_struct_in_data.rs
@@ -23,7 +23,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_non_copy_struct_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_non_copy_struct_data.rs
index c32b62f5..9103dfe7 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_non_copy_struct_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_non_copy_struct_data.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 use arbitrary::Arbitrary;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_data.rs
index 10d9e14d..f1c14c8a 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_data.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use arbitrary::Arbitrary;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_with_two_vecs.rs b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_with_two_vecs.rs
index af7a5f59..8cb62d0f 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_with_two_vecs.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/enum_with_struct_with_two_vecs.rs
@@ -1,7 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/match_with_wildcard_bindings.rs b/src/tests_and_benchmarks/ozk/programs/enums/match_with_wildcard_bindings.rs
index 4dc2a23d..986fe5b2 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/match_with_wildcard_bindings.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/match_with_wildcard_bindings.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/move_boxed_enum_to_stack.rs b/src/tests_and_benchmarks/ozk/programs/enums/move_boxed_enum_to_stack.rs
index aad314a3..61af6065 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/move_boxed_enum_to_stack.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/move_boxed_enum_to_stack.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use arbitrary::Arbitrary;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/rust_by_example_enums.rs b/src/tests_and_benchmarks/ozk/programs/enums/rust_by_example_enums.rs
index f52067f5..c1db9037 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/rust_by_example_enums.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/rust_by_example_enums.rs
@@ -67,8 +67,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
     use num::Zero;
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/two_variants_no_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/two_variants_no_data.rs
index 964fa012..e0512737 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/two_variants_no_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/two_variants_no_data.rs
@@ -43,8 +43,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::execute_compiled_with_stack_and_ins_for_test;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn two_variants_no_data_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/enums/two_variants_one_data.rs b/src/tests_and_benchmarks/ozk/programs/enums/two_variants_one_data.rs
index 571340b5..5e914154 100644
--- a/src/tests_and_benchmarks/ozk/programs/enums/two_variants_one_data.rs
+++ b/src/tests_and_benchmarks/ozk/programs/enums/two_variants_one_data.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::twenty_first::prelude::XFieldElement;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -48,12 +48,9 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/simple_enum_type.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/simple_enum_type.rs
index 3340e813..7e429b33 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/simple_enum_type.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/simple_enum_type.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 #[derive(BFieldCodec, Clone, Debug)]
 pub(super) enum SimpleEnum {
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/very_simple.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/very_simple.rs
index 40bfcdbc..becfcd74 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/very_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/very_simple.rs
@@ -1,6 +1,6 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
 use super::simple_enum_type::*;
 
@@ -26,12 +26,13 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::init_memory_from;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
 
+    use super::*;
+
     #[test]
     fn variant_a_test() {
         let variant_a = SimpleEnum::A;
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/with_catch_all.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/with_catch_all.rs
index a14ac525..d2e6febe 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/with_catch_all.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_boxed/with_catch_all.rs
@@ -1,6 +1,6 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
 
 use super::simple_enum_type::*;
 
@@ -27,12 +27,13 @@ fn catch_all_on_b() {
 mod test {
     use itertools::Itertools;
 
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::init_memory_from;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
 
+    use super::*;
+
     #[test]
     fn catch_all_on_b_test() {
         println!("a");
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/catch_all_condition.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/catch_all_condition.rs
index d860df9c..653e94ec 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/catch_all_condition.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/catch_all_condition.rs
@@ -3,7 +3,7 @@ use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 use crate::tests_and_benchmarks::ozk::rust_shadows;
 use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use proptest::collection::vec;
 use proptest::prop_assert_eq;
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/option_type.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/option_type.rs
index 277799e3..564563c1 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/option_type.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/option_type.rs
@@ -1,12 +1,14 @@
 #[cfg(test)]
 mod test {
+    use num::One;
+    use num::Zero;
+    use tasm_lib::triton_vm::prelude::*;
+
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::twenty_first::shared_math::x_field_element::XFieldElement;
-    use num::{One, Zero};
+    use tasm_lib::twenty_first::prelude::XFieldElement;
 
     fn most_basic() {
         let some_val: Option<u64> = Some(100);
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/panic_in_arm_body.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/panic_in_arm_body.rs
index 617e012b..56da9c24 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/panic_in_arm_body.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/panic_in_arm_body.rs
@@ -1,7 +1,7 @@
 use std::panic::catch_unwind;
 
-use crate::triton_vm::error::InstructionError;
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::error::InstructionError;
+use tasm_lib::triton_vm::prelude::*;
 
 use proptest::collection::vec;
 use proptest::prelude::*;
diff --git a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/three_variants.rs b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/three_variants.rs
index fc754243..11716478 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/three_variants.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_expr_on_stack/three_variants.rs
@@ -1,6 +1,6 @@
 use super::three_variants_type::*;
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 use tasm_lib::Digest;
 
 #[allow(clippy::collapsible_else_if)]
diff --git a/src/tests_and_benchmarks/ozk/programs/match_stmt_boxed/set_array_value_from_memory.rs b/src/tests_and_benchmarks/ozk/programs/match_stmt_boxed/set_array_value_from_memory.rs
index 456e47e3..2e883ddd 100644
--- a/src/tests_and_benchmarks/ozk/programs/match_stmt_boxed/set_array_value_from_memory.rs
+++ b/src/tests_and_benchmarks/ozk/programs/match_stmt_boxed/set_array_value_from_memory.rs
@@ -1,8 +1,7 @@
-use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
+
+use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
 #[derive(BFieldCodec, Clone, Debug)]
 enum EnumWithArrayData {
@@ -43,12 +42,13 @@ fn call_panic_on_a() {
 mod test {
     use itertools::Itertools;
 
-    use super::*;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::init_memory_from;
     use crate::tests_and_benchmarks::test_helpers::shared_test::TritonVMTestCase;
 
+    use super::*;
+
     #[test]
     fn call_panic_on_a_variant_b() {
         let bfes = (12..=24).map(BFieldElement::new);
diff --git a/src/tests_and_benchmarks/ozk/programs/option_types/is_some_is_none_unwrap.rs b/src/tests_and_benchmarks/ozk/programs/option_types/is_some_is_none_unwrap.rs
index 4edbd9d7..8314896d 100644
--- a/src/tests_and_benchmarks/ozk/programs/option_types/is_some_is_none_unwrap.rs
+++ b/src/tests_and_benchmarks/ozk/programs/option_types/is_some_is_none_unwrap.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/option_types/mutable_values.rs b/src/tests_and_benchmarks/ozk/programs/option_types/mutable_values.rs
index 0b0cdfb3..2c968bcf 100644
--- a/src/tests_and_benchmarks/ozk/programs/option_types/mutable_values.rs
+++ b/src/tests_and_benchmarks/ozk/programs/option_types/mutable_values.rs
@@ -1,6 +1,5 @@
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 #[allow(clippy::unnecessary_literal_unwrap)]
 #[allow(clippy::single_match)]
diff --git a/src/tests_and_benchmarks/ozk/programs/other/hash_varlen.rs b/src/tests_and_benchmarks/ozk/programs/other/hash_varlen.rs
index 343a8bee..b64df345 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/hash_varlen.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/hash_varlen.rs
@@ -1,13 +1,11 @@
 #![allow(clippy::explicit_auto_deref)]
 #![allow(clippy::needless_borrow)]
-
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::AlgebraicHasher;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
-type H = twenty_first::shared_math::tip5::Tip5;
+type H = Tip5;
 
 fn main() {
     let elements: Box<Vec<BFieldElement>> =
@@ -22,8 +20,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::ast_types;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/import_type_declaration.rs b/src/tests_and_benchmarks/ozk/programs/other/import_type_declaration.rs
index 2fec14b1..a8b6353e 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/import_type_declaration.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/import_type_declaration.rs
@@ -1,7 +1,6 @@
 use super::simple_struct::*;
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 fn main() {
     let ts: Box<SimpleStruct> =
diff --git a/src/tests_and_benchmarks/ozk/programs/other/nested_tuples.rs b/src/tests_and_benchmarks/ozk/programs/other/nested_tuples.rs
index e1245223..e404c39d 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/nested_tuples.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/nested_tuples.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -41,11 +40,8 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/removal_record_integrity_partial.rs b/src/tests_and_benchmarks/ozk/programs/other/removal_record_integrity_partial.rs
index 884cd559..88a8c1be 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/removal_record_integrity_partial.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/removal_record_integrity_partial.rs
@@ -3,13 +3,9 @@
 #![allow(unused_variables)]
 #![allow(clippy::vec_init_then_push)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
-use crate::triton_vm::twenty_first::util_types::merkle_tree::CpuParallel;
-use crate::triton_vm::twenty_first::util_types::merkle_tree_maker::MerkleTreeMaker;
-
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::*;
 use tasm_lib::VmHasher as H;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
@@ -160,18 +156,6 @@ mod test {
     use std::collections::HashMap;
     use std::marker::PhantomData;
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::amount::u32s::U32s;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-    use crate::triton_vm::twenty_first::shared_math::other::log_2_floor;
-    use crate::triton_vm::twenty_first::shared_math::tip5::Digest;
-    use crate::triton_vm::twenty_first::shared_math::tip5::DIGEST_LENGTH;
-    use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
-    use crate::triton_vm::twenty_first::util_types::algebraic_hasher::SpongeHasher;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_membership_proof::MmrMembershipProof;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_trait::Mmr;
-    use crate::triton_vm::twenty_first::util_types::mmr::shared_basic::leaf_index_to_mt_index_and_peak_index;
     use anyhow::bail;
     use itertools::Itertools;
     use num::One;
@@ -180,7 +164,10 @@ mod test {
     use rand::Rng;
     use rand::RngCore;
     use rand::SeedableRng;
-    use tasm_lib::structure::tasm_object::TasmObject;
+    use tasm_lib::twenty_first::prelude::tip5::DIGEST_LENGTH;
+    use tasm_lib::twenty_first::shared_math::other::log_2_floor;
+    use tasm_lib::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use tasm_lib::twenty_first::util_types::mmr::shared_basic::leaf_index_to_mt_index_and_peak_index;
     use tasm_lib::VmHasher;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/returning_block_expr_u32.rs b/src/tests_and_benchmarks/ozk/programs/other/returning_block_expr_u32.rs
index f85b4e03..fe7d2f57 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/returning_block_expr_u32.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/returning_block_expr_u32.rs
@@ -20,7 +20,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/simple_encode.rs b/src/tests_and_benchmarks/ozk/programs/other/simple_encode.rs
index 16f7dfb8..636dcdf4 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/simple_encode.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/simple_encode.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -22,7 +21,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/simple_map_on_bfe.rs b/src/tests_and_benchmarks/ozk/programs/other/simple_map_on_bfe.rs
index 9f6a5a77..dd2ad8f1 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/simple_map_on_bfe.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/simple_map_on_bfe.rs
@@ -1,5 +1,5 @@
-use crate::triton_vm::prelude::*;
 use itertools::Itertools;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -30,7 +30,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
 
@@ -74,8 +74,8 @@ mod test {
 mod benches {
     use std::collections::HashMap;
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;
     use crate::tests_and_benchmarks::benchmarks::BenchmarkInput;
diff --git a/src/tests_and_benchmarks/ozk/programs/other/simple_struct.rs b/src/tests_and_benchmarks/ozk/programs/other/simple_struct.rs
index c0059f88..3e2877db 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/simple_struct.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/simple_struct.rs
@@ -1,8 +1,7 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+use tasm_lib::triton_vm::prelude::*;
 
 use arbitrary::Arbitrary;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
 
 #[derive(TasmObject, BFieldCodec, Clone, Arbitrary)]
 pub(super) struct SimpleStruct {
diff --git a/src/tests_and_benchmarks/ozk/programs/other/value.rs b/src/tests_and_benchmarks/ozk/programs/other/value.rs
index 1148a4ed..b947c916 100644
--- a/src/tests_and_benchmarks/ozk/programs/other/value.rs
+++ b/src/tests_and_benchmarks/ozk/programs/other/value.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -17,7 +17,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe1.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe1.rs
index 0e0d6c1b..3cff72da 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe1.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe1.rs
@@ -23,8 +23,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe2.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe2.rs
index 218a7d56..980c9340 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe2.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe2.rs
@@ -27,8 +27,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn pe2_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe3.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe3.rs
index 32f9cf48..c5015a53 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe3.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe3.rs
@@ -31,8 +31,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn pe3_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe4.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe4.rs
index 53475227..9d833f3b 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe4.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe4.rs
@@ -69,8 +69,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn pe4_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe5.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe5.rs
index 4012fbb6..c392c711 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe5.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe5.rs
@@ -18,8 +18,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn pe5_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe6.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe6.rs
index 1a873cc3..552ae4e3 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe6.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe6.rs
@@ -26,8 +26,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
 
     use super::*;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/project_euler/pe7.rs b/src/tests_and_benchmarks/ozk/programs/project_euler/pe7.rs
index e898d28c..bcda9cb5 100644
--- a/src/tests_and_benchmarks/ozk/programs/project_euler/pe7.rs
+++ b/src/tests_and_benchmarks/ozk/programs/project_euler/pe7.rs
@@ -49,7 +49,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn pe7_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/arithmetic_domain.rs b/src/tests_and_benchmarks/ozk/programs/recufier/arithmetic_domain.rs
index cc023678..3400b0b8 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/arithmetic_domain.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/arithmetic_domain.rs
@@ -1,6 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct ArithmeticDomain {
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt.rs b/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt.rs
index 765e4308..4657a497 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt.rs
@@ -1,10 +1,8 @@
 #![allow(clippy::manual_swap)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::traits::ModPowU32;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::ModPowU32;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -141,11 +139,11 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::twenty_first::shared_math::ntt;
-    use crate::triton_vm::twenty_first::shared_math::other::log_2_floor;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
     use itertools::Itertools;
+    use tasm_lib::twenty_first::shared_math::ntt;
+    use tasm_lib::twenty_first::shared_math::other::log_2_floor;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
     #[test]
     fn fast_xfe_ntt_test() {
@@ -202,9 +200,9 @@ mod benches {
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
     #[test]
     fn fast_ntt_bench() {
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt_to_basic_snippet.rs b/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt_to_basic_snippet.rs
index b1b158e9..a51be4fa 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt_to_basic_snippet.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/fast_ntt_to_basic_snippet.rs
@@ -1,9 +1,8 @@
 #![allow(clippy::manual_swap)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::traits::ModPowU32;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::ModPowU32;
 
 #[allow(clippy::ptr_arg)]
 #[allow(clippy::vec_init_then_push)]
@@ -78,9 +77,9 @@ fn xfe_ntt(x: &mut Vec<XFieldElement>, omega: BFieldElement) {
 mod test {
     use std::collections::HashMap;
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
-    use crate::twenty_first::shared_math::x_field_element::XFieldElement;
+    use tasm_lib::twenty_first::prelude::XFieldElement;
 
     use crate::ast_types::ListType;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::*;
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/fri_verify.rs b/src/tests_and_benchmarks/ozk/programs/recufier/fri_verify.rs
index 582ac987..674fc3ef 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/fri_verify.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/fri_verify.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use super::arithmetic_domain::*;
 
@@ -41,7 +40,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use rand::random;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root.rs b/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root.rs
index 54abefc0..5a25ed93 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root.rs
@@ -1,8 +1,7 @@
 #![allow(clippy::explicit_auto_deref)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::AlgebraicHasher;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -35,10 +34,10 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::util_types::merkle_tree::CpuParallel;
-    use crate::triton_vm::twenty_first::util_types::merkle_tree::MerkleTree;
-    use crate::triton_vm::twenty_first::util_types::merkle_tree_maker::MerkleTreeMaker;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::util_types::merkle_tree::CpuParallel;
+    use tasm_lib::twenty_first::util_types::merkle_tree::MerkleTree;
+    use tasm_lib::twenty_first::util_types::merkle_tree_maker::MerkleTreeMaker;
 
     use crate::ast_types;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
@@ -81,7 +80,7 @@ mod test {
 }
 
 mod benches {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;
     use crate::tests_and_benchmarks::benchmarks::profile;
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root_autogen.rs b/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root_autogen.rs
index 95184bef..7737a568 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root_autogen.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/merkle_root_autogen.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::manual_swap)]
 
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
+use tasm_lib::twenty_first::prelude::AlgebraicHasher;
 use tasm_lib::Digest;
 
 type H = crate::twenty_first::shared_math::tip5::Tip5;
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/proof_item.rs b/src/tests_and_benchmarks/ozk/programs/recufier/proof_item.rs
index 6503a5b0..8652b165 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/proof_item.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/proof_item.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use arbitrary::Arbitrary;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/vm_proof_stream.rs b/src/tests_and_benchmarks/ozk/programs/recufier/vm_proof_stream.rs
index ab6a16a6..6f8a7f49 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/vm_proof_stream.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/vm_proof_stream.rs
@@ -1,8 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::tip5::Tip5State;
-
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::shared_math::tip5::Tip5State;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -35,7 +33,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use num::Zero;
     use rand::random;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/recufier/xfe_ntt_recursive.rs b/src/tests_and_benchmarks/ozk/programs/recufier/xfe_ntt_recursive.rs
index 334e689b..683995a0 100644
--- a/src/tests_and_benchmarks/ozk/programs/recufier/xfe_ntt_recursive.rs
+++ b/src/tests_and_benchmarks/ozk/programs/recufier/xfe_ntt_recursive.rs
@@ -1,8 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::traits::ModPowU32;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::ModPowU32;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -137,12 +135,12 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::ntt;
-    use crate::triton_vm::twenty_first::shared_math::other::log_2_floor;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
     use itertools::Itertools;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::ntt;
+    use tasm_lib::twenty_first::shared_math::other::log_2_floor;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
     use crate::ast_types;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/copy_types.rs b/src/tests_and_benchmarks/ozk/programs/result_types/copy_types.rs
index d84d6f14..d8d62b40 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/copy_types.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/copy_types.rs
@@ -1,5 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/non_copy_types.rs b/src/tests_and_benchmarks/ozk/programs/result_types/non_copy_types.rs
index 687a5858..8def54a4 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/non_copy_types.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/non_copy_types.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/prelude_match.rs b/src/tests_and_benchmarks/ozk/programs/result_types/prelude_match.rs
index 5ca2420f..333cce57 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/prelude_match.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/prelude_match.rs
@@ -1,5 +1,5 @@
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::One;
+use tasm_lib::twenty_first::prelude::XFieldElement;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -54,9 +54,9 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use rand::random;
     use std::default::Default;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn prelude_match_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/question_mark_operator.rs b/src/tests_and_benchmarks/ozk/programs/result_types/question_mark_operator.rs
index 16d0e1ee..07ec9c86 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/question_mark_operator.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/question_mark_operator.rs
@@ -1,7 +1,6 @@
 #![allow(clippy::needless_question_mark)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -60,7 +59,7 @@ mod test {
 
     use std::default::Default;
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/simple_unwrap.rs b/src/tests_and_benchmarks/ozk/programs/result_types/simple_unwrap.rs
index 60086e11..5a159397 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/simple_unwrap.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/simple_unwrap.rs
@@ -1,6 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-use tasm_lib::Digest;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -28,7 +26,7 @@ mod test {
 
     use std::default::Default;
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use itertools::Itertools;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/result_types/unwrap_crash.rs b/src/tests_and_benchmarks/ozk/programs/result_types/unwrap_crash.rs
index b57e63f8..85dfdf2c 100644
--- a/src/tests_and_benchmarks/ozk/programs/result_types/unwrap_crash.rs
+++ b/src/tests_and_benchmarks/ozk/programs/result_types/unwrap_crash.rs
@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 #[allow(clippy::unnecessary_literal_unwrap)]
 fn _crash_on_unwrap() {
@@ -23,8 +23,8 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::compile_for_test;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
     use std::default::Default;
+    use tasm_lib::triton_vm::prelude::*;
 
     #[test]
     fn unwrap_crash_test() {
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/declaration_on_stack_with_list.rs b/src/tests_and_benchmarks/ozk/programs/structs/declaration_on_stack_with_list.rs
index 0ab4907d..e28aa188 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/declaration_on_stack_with_list.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/declaration_on_stack_with_list.rs
@@ -1,7 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -58,7 +56,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/nested_structs.rs b/src/tests_and_benchmarks/ozk/programs/structs/nested_structs.rs
index a8e69828..3ecf38e8 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/nested_structs.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/nested_structs.rs
@@ -1,11 +1,9 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use rand::distributions::Standard;
 use rand::prelude::Distribution;
 use rand::Rng;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::shared_math::other::random_elements;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -90,7 +88,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use itertools::Itertools;
     use rand::random;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack.rs b/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack.rs
index 148ee8ce..d6c6c987 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack.rs
@@ -1,9 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
 use num::One;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -49,8 +46,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack_spilled.rs b/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack_spilled.rs
index 6dbebd36..78b0a97f 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack_spilled.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/simple_declaration_on_stack_spilled.rs
@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -71,8 +68,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/simple_nested_struct.rs b/src/tests_and_benchmarks/ozk/programs/structs/simple_nested_struct.rs
index 6bfb88a2..d516ae47 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/simple_nested_struct.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/simple_nested_struct.rs
@@ -1,6 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::BFieldCodec;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/simple_struct.rs b/src/tests_and_benchmarks/ozk/programs/structs/simple_struct.rs
index d27b97d6..2449ace8 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/simple_struct.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/simple_struct.rs
@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -39,10 +36,9 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_array.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_array.rs
index 8d7c7c37..49ae8b3c 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_array.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_array.rs
@@ -1,8 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-
 use arbitrary::Arbitrary;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -40,12 +38,11 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
     use arbitrary::Arbitrary;
     use arbitrary::Unstructured;
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_methods.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_methods.rs
index 5b7080a7..90e0f141 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_methods.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_methods.rs
@@ -1,8 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
 use num::Zero;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -68,12 +66,12 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::distributions::Standard;
     use rand::prelude::Distribution;
     use rand::random;
     use rand::Rng;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_simple_methods.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_simple_methods.rs
index 6e71a585..2aab03a9 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_simple_methods.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_simple_methods.rs
@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -36,8 +35,8 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_two_vecs_to_stack.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_two_vecs_to_stack.rs
index 35ec831a..d0fd4852 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_two_vecs_to_stack.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_two_vecs_to_stack.rs
@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -26,7 +23,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use arbitrary::Unstructured;
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_vecs.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_vecs.rs
index 854c65cb..87bf27c9 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_vecs.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_vecs.rs
@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -74,11 +71,10 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::random;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::ozk::ozk_parsing;
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
diff --git a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_xfe_and_xfes_to_stack.rs b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_xfe_and_xfes_to_stack.rs
index f37887b2..a6d1d5e4 100644
--- a/src/tests_and_benchmarks/ozk/programs/structs/struct_with_xfe_and_xfes_to_stack.rs
+++ b/src/tests_and_benchmarks/ozk/programs/structs/struct_with_xfe_and_xfes_to_stack.rs
@@ -1,10 +1,7 @@
 #![allow(clippy::len_zero)]
 
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-
 use arbitrary::Arbitrary;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -44,7 +41,6 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-
     use arbitrary::Unstructured;
     use itertools::Itertools;
     use rand::random;
diff --git a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_many.rs b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_many.rs
index b5461915..f87675b4 100644
--- a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_many.rs
+++ b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_many.rs
@@ -4,7 +4,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     fn main() {
         let mut a: Vec<BFieldElement> = Vec::<BFieldElement>::with_capacity(32);
diff --git a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_simple.rs b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_simple.rs
index d1492a82..02728db5 100644
--- a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_simple.rs
@@ -3,7 +3,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     fn main() {
         let mut a: Vec<BFieldElement> = Vec::<BFieldElement>::with_capacity(32);
diff --git a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_very_simple.rs b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_very_simple.rs
index b19711ed..48a3005a 100644
--- a/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_very_simple.rs
+++ b/src/tests_and_benchmarks/ozk/programs/vectors/clone_from_very_simple.rs
@@ -3,7 +3,7 @@ mod test {
     use crate::tests_and_benchmarks::ozk::ozk_parsing::EntrypointLocation;
     use crate::tests_and_benchmarks::ozk::rust_shadows;
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     fn main() {
         let mut a: Vec<BFieldElement> = Vec::<BFieldElement>::with_capacity(32);
diff --git a/src/tests_and_benchmarks/ozk/rust_shadows.rs b/src/tests_and_benchmarks/ozk/rust_shadows.rs
index 2e499db3..9228ae05 100644
--- a/src/tests_and_benchmarks/ozk/rust_shadows.rs
+++ b/src/tests_and_benchmarks/ozk/rust_shadows.rs
@@ -3,16 +3,6 @@ use std::collections::HashMap;
 use std::thread_local;
 use std::vec::Vec;
 
-use crate::triton_vm::proof_item::FriResponse;
-use crate::triton_vm::proof_item::ProofItem;
-use crate::triton_vm::table::master_table::NUM_BASE_COLUMNS;
-use crate::triton_vm::table::master_table::NUM_EXT_COLUMNS;
-use crate::triton_vm::twenty_first::shared_math::b_field_element::BFIELD_ONE;
-use crate::triton_vm::twenty_first::shared_math::b_field_element::BFIELD_ZERO;
-use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
-use crate::triton_vm::twenty_first::util_types::algebraic_hasher::SpongeHasher;
 use anyhow::bail;
 use num::Zero;
 use rand::rngs::StdRng;
@@ -20,7 +10,13 @@ use rand::Rng;
 use rand::RngCore;
 use rand::SeedableRng;
 use tasm_lib::triton_vm::prelude::*;
-use tasm_lib::Digest;
+use tasm_lib::triton_vm::proof_item::FriResponse;
+use tasm_lib::triton_vm::proof_item::ProofItem;
+use tasm_lib::triton_vm::table::master_table::NUM_BASE_COLUMNS;
+use tasm_lib::triton_vm::table::master_table::NUM_EXT_COLUMNS;
+use tasm_lib::twenty_first::prelude::*;
+use tasm_lib::twenty_first::shared_math::b_field_element::BFIELD_ONE;
+use tasm_lib::twenty_first::shared_math::b_field_element::BFIELD_ZERO;
 use tasm_lib::VmHasher;
 
 use crate::tests_and_benchmarks::ozk::programs::recufier::vm_proof_stream::VmProofStream;
diff --git a/src/tests_and_benchmarks/programs/arithmetic/bfe.rs b/src/tests_and_benchmarks/programs/arithmetic/bfe.rs
index a06552da..5e0635a3 100644
--- a/src/tests_and_benchmarks/programs/arithmetic/bfe.rs
+++ b/src/tests_and_benchmarks/programs/arithmetic/bfe.rs
@@ -2,13 +2,13 @@ use syn::parse_quote;
 
 #[cfg(test)]
 mod run_tests {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
     use itertools::Itertools;
     use num::One;
     use num::Zero;
     use rand::random;
     use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/arithmetic/u128.rs b/src/tests_and_benchmarks/programs/arithmetic/u128.rs
index 6be2960d..4288eb07 100644
--- a/src/tests_and_benchmarks/programs/arithmetic/u128.rs
+++ b/src/tests_and_benchmarks/programs/arithmetic/u128.rs
@@ -1,10 +1,10 @@
 #[cfg(test)]
 mod run_tests {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::thread_rng;
     use rand::Rng;
     use syn::parse_quote;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/arithmetic/u32.rs b/src/tests_and_benchmarks/programs/arithmetic/u32.rs
index 2b6fdd87..a9fe3809 100644
--- a/src/tests_and_benchmarks/programs/arithmetic/u32.rs
+++ b/src/tests_and_benchmarks/programs/arithmetic/u32.rs
@@ -2,11 +2,11 @@ use syn::parse_quote;
 
 #[cfg(test)]
 mod run_tests {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::random;
     use rand::thread_rng;
     use rand::RngCore;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/arithmetic/u64.rs b/src/tests_and_benchmarks/programs/arithmetic/u64.rs
index 63539d0d..d74a7135 100644
--- a/src/tests_and_benchmarks/programs/arithmetic/u64.rs
+++ b/src/tests_and_benchmarks/programs/arithmetic/u64.rs
@@ -52,12 +52,12 @@ fn divmoddi4_u64_rast() -> syn::ItemFn {
 
 #[cfg(test)]
 mod run_tests {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::random;
     use rand::thread_rng;
     use rand::Rng;
     use rand::RngCore;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/arithmetic/xfe.rs b/src/tests_and_benchmarks/programs/arithmetic/xfe.rs
index 0ebd86a9..895ecaa2 100644
--- a/src/tests_and_benchmarks/programs/arithmetic/xfe.rs
+++ b/src/tests_and_benchmarks/programs/arithmetic/xfe.rs
@@ -2,13 +2,13 @@ use syn::parse_quote;
 
 #[cfg(test)]
 mod run_tests {
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::x_field_element::EXTENSION_DEGREE;
     use itertools::Itertools;
     use num::One;
     use num::Zero;
     use rand::random;
     use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::x_field_element::EXTENSION_DEGREE;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/bfield_codec.rs b/src/tests_and_benchmarks/programs/bfield_codec.rs
index aa2d2e8a..c477d799 100644
--- a/src/tests_and_benchmarks/programs/bfield_codec.rs
+++ b/src/tests_and_benchmarks/programs/bfield_codec.rs
@@ -2,11 +2,11 @@
 mod run_tests {
     use std::vec;
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
     use itertools::Itertools;
     use rand::random;
     use syn::parse_quote;
     use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/hashing.rs b/src/tests_and_benchmarks/programs/hashing.rs
index caf91306..6165ea6e 100644
--- a/src/tests_and_benchmarks/programs/hashing.rs
+++ b/src/tests_and_benchmarks/programs/hashing.rs
@@ -3,9 +3,6 @@ mod run_tests {
     use std::collections::HashMap;
     use std::vec;
 
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::tip5::Tip5;
-    use crate::triton_vm::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
     use itertools::Itertools;
     use num::One;
     use num::Zero;
@@ -13,6 +10,8 @@ mod run_tests {
     use syn::parse_quote;
     use tasm_lib::rust_shadowing_helper_functions;
     use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::prelude::AlgebraicHasher;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
 
     use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/programs/io.rs b/src/tests_and_benchmarks/programs/io.rs
index c8d21fd9..dfd113d6 100644
--- a/src/tests_and_benchmarks/programs/io.rs
+++ b/src/tests_and_benchmarks/programs/io.rs
@@ -2,8 +2,6 @@ mod run_tests {
     use std::collections::HashMap;
     use std::vec;
 
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
-    use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
     use rand::random;
     use syn::parse_quote;
     use tasm_lib::triton_vm::prelude::*;
diff --git a/src/tests_and_benchmarks/programs/mmr.rs b/src/tests_and_benchmarks/programs/mmr.rs
index d9421c7c..a5a0779c 100644
--- a/src/tests_and_benchmarks/programs/mmr.rs
+++ b/src/tests_and_benchmarks/programs/mmr.rs
@@ -1,7 +1,8 @@
-use crate::tests_and_benchmarks::test_helpers::shared_test::item_fn;
 use syn::parse_quote;
 use syn::ItemFn;
 
+use crate::tests_and_benchmarks::test_helpers::shared_test::item_fn;
+
 pub(crate) fn verify_authentication_path_with_local_function() -> ItemFn {
     item_fn(parse_quote! {
         fn verify_authentication_path(
diff --git a/src/tests_and_benchmarks/programs/vectors/map.rs b/src/tests_and_benchmarks/programs/vectors/map.rs
index 2674753a..c4fc8bba 100644
--- a/src/tests_and_benchmarks/programs/vectors/map.rs
+++ b/src/tests_and_benchmarks/programs/vectors/map.rs
@@ -20,10 +20,10 @@ mod tests {
     mod run_tests {
         use std::collections::HashMap;
 
-        use crate::triton_vm::twenty_first::shared_math::other::random_elements;
         use itertools::Itertools;
         use tasm_lib::rust_shadowing_helper_functions::safe_list::safe_list_insert;
         use tasm_lib::triton_vm::prelude::*;
+        use tasm_lib::twenty_first::shared_math::other::random_elements;
 
         use crate::tests_and_benchmarks::test_helpers::shared_test::*;
 
diff --git a/src/tests_and_benchmarks/test_helpers/from_neptune_core.rs b/src/tests_and_benchmarks/test_helpers/from_neptune_core.rs
index 8f91f8b6..f6869b1f 100644
--- a/src/tests_and_benchmarks/test_helpers/from_neptune_core.rs
+++ b/src/tests_and_benchmarks/test_helpers/from_neptune_core.rs
@@ -1,6 +1,10 @@
 // We allow this file to be messy for now, as we're importing a lot from Neptune Core.
 #![allow(dead_code)]
 #![allow(unused_variables)]
+
+use std::collections::HashMap;
+use std::marker::PhantomData;
+
 use anyhow::bail;
 use field_count::FieldCount;
 use itertools::Itertools;
@@ -10,14 +14,12 @@ use rand::rngs::StdRng;
 use rand::Rng;
 use rand::RngCore;
 use rand::SeedableRng;
-use std::collections::HashMap;
-use std::marker::PhantomData;
-use tasm_lib::structure::tasm_object::TasmObject;
+use tasm_lib::prelude::TasmObject;
 use tasm_lib::triton_vm::prelude::*;
-use tasm_lib::twenty_first::amount::u32s::U32s;
+use tasm_lib::twenty_first::prelude::tip5::DIGEST_LENGTH;
+use tasm_lib::twenty_first::prelude::AlgebraicHasher;
+use tasm_lib::twenty_first::prelude::U32s;
 use tasm_lib::twenty_first::shared_math::other::log_2_floor;
-use tasm_lib::twenty_first::shared_math::tip5::DIGEST_LENGTH;
-use tasm_lib::twenty_first::util_types::algebraic_hasher::AlgebraicHasher;
 use tasm_lib::twenty_first::util_types::algebraic_hasher::SpongeHasher;
 use tasm_lib::twenty_first::util_types::merkle_tree::CpuParallel;
 use tasm_lib::twenty_first::util_types::merkle_tree_maker::MerkleTreeMaker;
@@ -25,7 +27,6 @@ use tasm_lib::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
 use tasm_lib::twenty_first::util_types::mmr::mmr_membership_proof::MmrMembershipProof;
 use tasm_lib::twenty_first::util_types::mmr::mmr_trait::Mmr;
 use tasm_lib::twenty_first::util_types::mmr::shared_basic::leaf_index_to_mt_index_and_peak_index;
-
 use tasm_lib::VmHasher;
 
 pub(crate) const NATIVE_COIN_TYPESCRIPT_DIGEST: Digest = Digest::new([