Updated Folder Structure & Data