Merge "x/ref: Move packages without external users into internal."