Merge "Add subfolders creation"