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/.
Removed in cc9660fe7d459b4a307da87502cad7310235bc9c