Updated Folder structure