Merge filelist move logic into a single iteration loop

[dirkmueller]

This is needed to avoid the '$_ undefined variable' errors introduced by the last change.