Internal refactor to master cmd

First-pass breakup of logical components into function calls for general
maintainability, refactorability, merge-conflict-avoidance, etc.
We explicitly don't want flexibility here.  Part of the point of this is not to expose this complexity.  I don't ever want to have to go back and take this out, because none of it is required.