diff --git a/datafusion-federation/src/lib.rs b/datafusion-federation/src/lib.rs
index 46ab64e..0a5f5db 100644
--- a/datafusion-federation/src/lib.rs
+++ b/datafusion-federation/src/lib.rs
@@ -1,11 +1,9 @@
 mod optimizer;
 mod plan_node;
+pub mod schema_cast;
 #[cfg(feature = "sql")]
 pub mod sql;
 mod table_provider;
-// TODO clean up this
-// TODO move schema_cast.rs to schema_cast directory
-pub mod schema_cast;
 
 use std::{
     fmt,
diff --git a/datafusion-federation/src/schema_cast.rs b/datafusion-federation/src/schema_cast/mod.rs
similarity index 100%
rename from datafusion-federation/src/schema_cast.rs
rename to datafusion-federation/src/schema_cast/mod.rs