Use new cargo conventions