renaming and re-org of mod.rs