Add some more of program flow and adjust structure to match basename.rs