Modify order of resolution in folder search to match our design.