corrected folder structure