Further enhanced folder structure