Try to make subfolders more consistent.