Move and update clap-info