Moved commands to their own classes