Improve layout of merged single-crate modules in Rust

[robin-aws]

#583 adds all but one service under crate::deps, but we'd likely prefer to put all services at the same top level and just use their names directly.