Use idiomatic crate structure