Updated Folder and file structure for content