Export folder structure fixed