Mimic old folder ordering in all locales. (#607) Also ensure root folder stays on top.