Update for latest Rust

At least some of the structs should probably be migrated to camel case names at some point.