Reorganized main.rs