Move CLI to Thor