Folder Fix Part1.
Folder Fix Part2.