pub mod -> pub use
Merge branch 'pub-use'