Binutils has a "contrib" subdirectory - thus flattening cannot happen without renaming the upper level contrib directory in a first pass. Also, don't record this move and remove any keyword expansion.
(this is Binutils from the FSF 2.11 branch [checked out 19-July-2001])