cmpro does move chds to the correct place (unless there is already one in place) and cleans up the folder (when not empty)
since noone else seems to have the problem and reported it yet, please post a detailed problem description with examples at the cmpro forum. With an example I will be able to check what's going on in your case...