reorg main and config into cli package
Move more command line-derived setup into the Config object

Seems to sit well there, makes it easy to see where the meat of Main
is.