Move commands to own classes