folder structure optimization