Consolidate cmds in cmd/
Update all deps to latest version