cmd/root: Restructure to be more idempotent#29

ashcrow merged 3 commits intoopenshift:masteropenshift/pivot:masterfrom

jlebon:pr/moarr-idemjlebon/pivot:pr/moarr-idemCopy head branch name to clipboard