Internal refactor to master cmd

First-pass breakup of logical components into function calls for general
maintainability, refactorability, merge-conflict-avoidance, etc.
It's fine to methodize it, and it's not a general problem yet (no one else has to do it, because openshift hides the details)