Refactor commands to their own class