diff --git a/rust/cardano-chain-follower/src/metadata/cip509/mod.rs b/rust/cardano-chain-follower/src/metadata/cip509/mod.rs
index 08ae4ce5eab..493aebdb3a6 100644
--- a/rust/cardano-chain-follower/src/metadata/cip509/mod.rs
+++ b/rust/cardano-chain-follower/src/metadata/cip509/mod.rs
@@ -3,23 +3,18 @@
 //! CDDL Reference: <https://github.com/input-output-hk/catalyst-CIPs/blob/x509-envelope-metadata/CIP-XXXX/x509-envelope.cddl>
 
 // cspell: words pkix
-use c509_certificate::general_names::general_name::GeneralNameValue;
-use decode_helper::{decode_bytes, decode_helper, decode_map_len};
-use der_parser::{asn1_rs::oid, der::parse_der_sequence, Oid};
-use rbac::{certs::C509Cert, role_data::RoleData};
+
+pub mod rbac;
+pub mod x509_chunks;
 
 mod decode_helper;
-mod rbac;
 mod utils;
-use utils::{
-    compare_key_hash, decremented_index, extract_cip19_hash, extract_key_hash,
-    zero_out_last_n_bytes,
-};
-use x509_cert::{der::Decode as _, ext::pkix::ID_CE_SUBJECT_ALT_NAME};
-mod x509_chunks;
 
 use std::sync::Arc;
 
+use c509_certificate::general_names::general_name::GeneralNameValue;
+use decode_helper::{decode_bytes, decode_helper, decode_map_len};
+use der_parser::{asn1_rs::oid, der::parse_der_sequence, Oid};
 use minicbor::{
     decode::{self},
     Decode, Decoder,
@@ -31,7 +26,13 @@ use pallas::{
     },
     ledger::traverse::MultiEraTx,
 };
+use rbac::{certs::C509Cert, role_data::RoleData};
 use strum::FromRepr;
+use utils::{
+    compare_key_hash, decremented_index, extract_cip19_hash, extract_key_hash,
+    zero_out_last_n_bytes,
+};
+use x509_cert::{der::Decode as _, ext::pkix::ID_CE_SUBJECT_ALT_NAME};
 use x509_chunks::X509Chunks;
 
 use super::{