My very same problem. The more I try to search about it, the more I get astonished to see that it seems that there is no way around this! All those folders spread out… I really wish to have a Collect/consolidate all files to ONE folder on migration. Please!