Commands Refactor Part 2

We split #196 in two parts. this is the second. (#262 is the first). This builds on all the changes to commands/.
Yes, but shouldn't the cli root include those? where are they getting patched in? not obvious.