Separated the commands into their own classes