New format with subfolders
Merged