Reorganize client and cli packages Upstream-commit: 90dfb3dacc56d789b70f5b5f3da6791465706c6c Component: engine