[trunk] FolderReorgProposal task: rename cli tools