Refactor commands/subsystem

[KingoftheFlame]

I believe that this branch is ready to merge, but I want to see if there is anything else we need to add first.