Refactor out command line parsing into new classes. Move default CLI into a new class.