mv files to right folder

cherry-picks c4631fc