Changes to command line structure
Reorg of code in main function to match new arguments