Move root cli*Commands and cliSetup into src/cli, delete the forwarding layer, point src/cli.ts and tests at the owners. No forwarding shims.