Added subfolder ordering