Add a -r option similar to rpmdev-bumpspec.
Reorganize, bugfixReorganize, bugfix