folder structure improved