Move commands/flags definitions with command docs.

Conflicts:
	cli.go