Moving files to better reflect coding conventions in Rust
Reduced visibility of items
Some slight cleanup