Merge "Move shared config structs to shared crate."