Refactor commands into their own module