CLI is now within package