Start to re-arrange optparse sources to match standard Rust lib conventions