mod.rs cleanup and renaming
cleanup, renaming
syntax test cases pass
1linecomment