Merge "Refactor pseudo-crate code into struct and methods." into main