Move Client to a separate client/mod.rs file instead of keeping it in lib.rs
Until we have a lot more complicated things going on, I don't think there's need for separate directories. This moves */mod.rs to *.rs.
Use more conventional imports - and clean up and organize and standardize imports