Refactor the command line data structures
Implement the command line parsing and dispatching