Batch folder structure updated