Move CLI to default package