Add message helper.
Avoid circular copy/move.
Move must remove source directories.