Updated main.rs to use new classes