Corrected Folder structure